Fix watch closer and lint errors