More minor fixups.