Fix Code Size PMD warnings
Fix Code Size PMD warnings
Fix plural form
Fix not null but empty certificate