Make corrections for CASSANDRA-6974

See:
https://issues.apache.org/jira/browse/CASSANDRA-7846
https://issues.apache.org/jira/browse/CASSANDRA-6974