Minor changes and bugfixes

See Changelog