Yet more Gradle build issues resolved