Stable cm11 fixes