Fixes to run scikit learn with the current development version