Fixes for ElasticSearch 0.90.x