More t11 fixes.