More fixes for chapter 02