BugFix: Boot code