Added FindBugs + corrected files based on findbugs findings