Fix a couple constancy bugs in the variables