Fixes for New Android Studio