fix specific issues for Android 2.3