fix minor build problems with Gradle 2.0