Fix a few variable names so it compiles