Minor Java changes