Fix initialization issues