Fixup address usage.