Fixed UID calculation with TZs
Actually fixed TZ issue with syncing now
TZ refactoring