Additional fixes to missing-disk protection
Improvements to MeasureScreen