Fixes

Thanks to @CyanogenMod