Fix file watching