Fix default address handling