Fixes on chapter 8