Some minor changes towards x-validation for GPC