Fixed bugs so that instructor notebook will work