Minor changes made

See CHANGELOG.txt for details