Little fix to Chapter 2 and Chapter 18