Fix address population