Gradle build fixes.