Changelog update
Filewatcher coding style fixes