Minor measure_loc improvements