More struct fixes