Fixes for chapter 1
Fixes for chapter 2