More fixes for chapter 1