Fixes for chapter 10.2