structure fixes