New governor tweaks (Thanks to project fluid)