More interpolation fixes