Fixes small issues detected on a second reading.