Code review changes for keyword support and syslog