Several bug fixes in save_key().