Minor tweaks / bugfixing