findbug corrections and some refinements