More minor bugfixes