fixing more address references