bug fixes relating to .save in Client and PM