Mostly sorted out boot order