AS 1.0 Gradle fixes