couple of fixes to ensure integration test passes for both supported versions of cassandra