Proper recovery for ephemerals
Added a manual sync