file watch fixes