Structure fixes