Handling race conditions in state

Identify and fix data inconsistency issues in highly concurrent state updates.