Gradle 1.8 and API tweaks