Fixups for markright.