Chapter 13s pull request review fixes