Fixed a few bugs with the previous pending save file changes

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>