Bug fixes with cassandra deployment