DB sync changes

Think I found the final fix for DB Sync