Sync fixes and trebuchet-local fixes