Fixes for chapter 9.3