Second round of fixes in manual 1.6