Some ondemand governor tweaks