Modified some address related goodies