fixed several findbug warnings