More Gradle changes