Fixes to exercise 3.