Fix sync and add find-common helper