Missed some initializations