Findbugs violation fixes
Findbugs violation fixes