Path fixes for file watchers