Fix Analysis save and save as