More minor fixups