Exercise 41 bug fixes