Small structure fixes