several little fixups