Gradle build improvements