Minor FileWatch improvements