Fixed some mistakes preventing from booting