Fixing PMD and Find Bugs analysis.

Applying fixes to pass the analysis build.