Some minor Java changes