some structure fixes