Fixed findbugs findings