last minute r1.8 fixes