Chapter 055: Two fixes and three changes