Fix initialization methods