[ci skip] More notebook fixes
see #2361