last fixes for java