minor fixes according to java driver