Tweak & clean up OnDemand Gov.