Fix build & boot (sorry, I'm gettig tired of seperated commits)