Fixed client for Linux / Ubuntu (watcher was screwy)