Fixed a couple small bugs with saving and loading