11.38 fixes (work in progress)