Minor java tweaks.