Fix lots of unrelated data races
Merge pull request #220 from axw/fix-data-races

Fix lots of unrelated data races