Fix Findbug issues