Fixes to cassandra-client types and minor fix to express