Fix bad variables