Fixed findbugs issues
Fixed findbugs issues