Further fixes for Android Studio