Small fixies in the whole Chapter 5