more notebook api fixes