More fixes for the structure.