Fixes for Gradle / Android Studio