Quick changes for Android 4.3