Adding in KitKat+ workarounds