Few fixes in the interpolation