P: scikit-example, fixes