Cloud save fixes and improvements