more 32-bit fixes
more 32-bit fixes

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