Fixes for chapter 10.1