more fixups