Further Gradle adjustments