gradle fixups