[KitKat] Fix some things after latest round of CM commits