Update for new Gradle things