Fixing some other broken variable references.