Fix formatting issues during bootup