Additional original boot tweaks