Minor tweaks to interpolation routines