Minor fixes to analyzing all measures.