Fix how addresses are looked up