Small fixes to variables