Fixed Gradle build issues