A few fixes for section 4.1