core bus/repo PMD & findbugs fixes