Fixed gradle builds