Finish bugs from Chapter 7