Fixes for the latest Android Studio version