Fixes for JB Bootloader