Fixups to mistakes of the past.