Fixed initialization issues