Fixes for chapter 8.1