Some var fixes.