More minor bug fixes.