Some more 1.7 fixes