Add fix for address dumps