Various improvements to Profile saving & updating, fixes #824