Suspend Governor: Some fixes