Some small changes with saving stuff