Some fixes for Exercise 2, Part 3.