fixup! more minor fixups