Minor updates for Cassandra 1.2 support