Bugfixes from production
Desync detection