Suspend Governor: Some last fixes