Gradle fixups