Various fixes for interpolation.