Fixes on saving/loading