Make sure grid_search support compiles
Use the correct functions