struct fixes