Try to fix the boot stuff a bit more