Make cm10.1 compatible