New changes with vars

Fixes 2 issues