Fixing findbug warnings