Gradle: Fixes