Fix interpolation variables