Small fixes for fluentd