Fix some desync problems