more minor fixups