Fixing some stuff with the variables