Fix a few more variables