Mult-version curl fixes