Fix  variable uses