Fixes for chapter 11