Fixes to make it work with pluggable addresses

Fixes to make it work with pluggable addresses