Minor fixes in Cassandra package