Fix contact saving issues