Fix initialization orders