a few fixups