Get addresses fixes