fixes for Android 2.x