[Fix #38] Fixes for Datastax Java driver 2.0