Fix broken interpolation variables