Fixes and improvements to bidirectional saving; Fixes #1049