Fixes for Android 4.3