A few trivial java tweaks