More structure fixes