Fix file watch problems.