[FIX] Some more interpolator (attempted) fixes