Fixed up var references