Fixes for logstash 1.2.x