Correct mis-typed variables