Fix most of the notebooks according to #2361