Fix FindBugs errors
Tweak PMD - logging guards only for trace