fix more field initialziation order issues