Fix var references