Fixes to Gradle build system.