Add fixes to variables