Fixed initialization errors