Fix initialization order issues