Gradle build file fixes