Suspend Governor: Fix some minor stuff