Bugfixes to load() / save()