Fixed some things that become broken with the save and load system