Fix lesson 7 bugs