Exercise 4 fixes