Ondemand governor tweaks