1.1 fixes