Fixes on chapter 6