legion: more bug fixes for local mapping
legion: more bug fixes for local mapping

sdalton1/legion,StanfordLegion/legion,sdalton1/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,sdalton1/legion,sdalton1/legion,sdalton1/legion,StanfordLegion/legion,StanfordLegion/legion,sdalton1/legion,StanfordLegion/legion