FindBugs/PMD Issues Corrected