Minor tweaks to saving/loading