Added better sync checking.
Testing on a build server for concurrency issues.