More 1.1 fixes