Even more gradle changes...