Fix boot issues