CASSANDRA-7838 WIP -adding a few other checks.