Updates for a smoother boot