Fixed all FindBugs problems
Fixed more for PMD