various fixes for notebooks