Correct errors in variables definition