Changes to make Gradle build work.