Fixed broken file recursion for inotify watches, and some other small fixes.