Exercise 1 fixups
Exercise 2 fixups