Fixed notebook issues