Make boot code work correctly...