some fixups.