Gradle improvements, fix version thing