Including several fixes and easeness from bsb master