bugfixes for new android/cm versions