Small structure changes.