Gradle 2.1 fixes