Gradle fixes