Minor changes / bugfixes