Partial Findbugs Warnings cleanup [#49]

I've tried to fix some Findbugs Warnings