Remove deprecation warnings

Also bump clamp