Boot sequence tweaks & misc