Changed DirectoryScanningMonitor to use a 2 second timeout for all of its AutoResetEvent.WaitOne() calls. Moved the timeout value to a constant.