Fix a couple of undefined variables