More 1.7 fixes...