Update to work with the recent address changes.