Fix problems in boot process