Late b2 fixes

Few late fixes that needed to be added