Cyruslogwatch updates and bug fixes