Fixes fro chapter 1