Chapter 5: small fixes.