Fixes for new Android Studio