Some adjustments to the new scikit-learn version used (0.14-git).