a couple fixups