Lesson fixes