Fixes to getting addresses.