Gradle Fixes