Even more java tweaks