more fixes for address