Fix issues with timeouts on Cassandra