misc. fixes on 2nd bootloader