Bugfixes in "save file"