Fixes before swithing to polynomial interpolation