Fixed data races