Potential fix for save/load smashing, should run everything through the proxy potentially