Cassandra and Transport fixes