Fix some issues with fields initializations