Initial CM 11 fixes