Fixes for section 3.1.1