Fix: Fixed a few variables that weren't changed correctly