Minor changes

See diff