Tweaks to CassandraResource and ElasticSearchResource