bjt42 Misc fixes