more fixup code.