some fixups