Fixing var references from merge.