Improvements for sync/claim