More corrections for 1.8.2.1