mionor fixes accoring to java driver