Fixing cassandra-related stuff in qa