Fixes for chapter 9.4