Fixing a couple of bugs around save behavior and loaders