Updates to accommodate implementation changes for measure-debug.