Gradle build issues resolved