Fix findbug warnings