Lesson 5 fixes