more Composite -> Structure fixes