Fix address handling.