Fixing badly set vars