More spline fixes