More minor bugfixes.