Fix PMD errors in com_finder code