Lesson 2 fixes