Fixed few findbugs warnings