Fixed pathwatchers as part of issue #41.