Fix problems with save