A few minor 1.1.8 fixes.