More fixes to structure