Fixes and corrections to 66.2/12.4.1