r4228: Interpolation fixes