Fixes for chapter 3
More fixes for chapter 3