Fix some issues with the Datastax driver