Fixes for cloud sync, and shelving.