Gradle: Fix some things (hopefully)