Gradle fixes from AS update