diff --git a/browser/root-certs b/browser/root-certs
index 54038f33c..402f1178e 100755
--- a/browser/root-certs
+++ b/browser/root-certs
@@ -49,6 +49,7 @@ function getRootCerts(callback) {
       + '  pem = pem + "";\n'
       + '  pem = pem.replace(/-----BEGIN CERTIFICATE-----/g, "");\n'
       + '  pem = pem.replace(/-----END CERTIFICATE-----/g, "");\n'
+      + '  pem = pem.trim().split(/(?:\\r?\\n){2,}/).pop();'
       + '  pem = pem.replace(/\\s+/g, "");\n'
       + '  if (!Object.prototype.hasOwnProperty.call(trusted, pem)) return;\n'
       + '  return trusted[pem];\n'
diff --git a/lib/common/PayPro.js b/lib/common/PayPro.js
index 2f62b8462..b3cffa9a5 100644
--- a/lib/common/PayPro.js
+++ b/lib/common/PayPro.js
@@ -399,7 +399,7 @@ PayPro.prototype._DERtoPEM = function(der, type) {
   if (typeof der === 'string') {
     der = new Buffer(der, 'hex');
   }
-  var type = type || 'UNKNOWN';
+  var type = type || 'PRIVACY-ENHANCED MESSAGE';
   der = der.toString('base64');
   der = der.replace(/(.{64})/g, '$1\r\n');
   der = der.replace(/\r\n$/, '');
diff --git a/lib/common/RootCerts.js b/lib/common/RootCerts.js
index 71501d4c9..f5eb32446 100644
--- a/lib/common/RootCerts.js
+++ b/lib/common/RootCerts.js
@@ -3718,6 +3718,7 @@ function getTrusted(pem) {
   pem = pem + "";
   pem = pem.replace(/-----BEGIN CERTIFICATE-----/g, "");
   pem = pem.replace(/-----END CERTIFICATE-----/g, "");
+  pem = pem.trim().split(/(?:\r?\n){2,}/).pop();
   pem = pem.replace(/\s+/g, "");
   if (!Object.prototype.hasOwnProperty.call(trusted, pem)) return;
   return trusted[pem];