Fixing some grunt errors with the elasticsearch grammar changes