Small updates following Chapter 6 exercises