More minor changes addressing PMD warnings