Fixed more address problems