Fixes for address scan