General Cross-validation: update for GPDB40, 41 and PG84

Solved some compatibility issues