Some fixes regarding the boot