Fixes to sections 8 & 9