Changes to make Gradle builds work.