Changes for bootloader building