More Interpolation fixes ready for test