Apply patches from Nightwalker for modules/sync.