FIX: Fixes for the cross_validation failure