Some Java updates