Fix uninitialized member and reorder members.