Some small governor tweaks

Change-Id: I0ea168d0d6115b4487bc8fb5d236e088d2d323f9