Various fixes
Trying to get Cassandra DB connection working