More gradle fixes