some minor changes. some of them may be needed with the new logstash configs.