Lecture 7 fixes