Fix some init stuff