thesis: Fix small issues in Chapter 4 and 1