Fix gradle support