Merged cookbook corrections from 3.2.