Fixes for fluentd 1.9.x