More gradle fixes
Even more gradle fixes