Fixed some initializations