Moved Gradle fixes