Fixed a few problems with booting on real hardware (George did)