[Chapter 7 + Extra] slight consistency fixes