Better join handling on sync