changes to work with java driver 2.12