Fixes for Android 2.3