Fix mixmatched vars