More interpolation fixes.