various fixes with interpolants