Fix issue syncing / data cleaning issues