Redo some broken measurements