More minor bugfixes...