Fix up a couple issues with multi-core builds and 2 race conditions