Fixing var references from recent merge.