Small tweaks from PMD & FindBugs