Fix boot stuff