Partial Findbugs Warnings cleanup [#49]