Fixes to saving/loading