KitKat fixes