Bug fixes to improved measurement scheduler