Fix watch errors, correct file names.