Fixes for cm11. Enough for today.

No more love for p760?