more fixes in address handling