Fix # of returned vars