More minor bugfixing