Pierre fixes in chap. 1 & 8