Ondemand Governor Tweaks