diff --git a/lib/asn1time.cpp b/lib/asn1time.cpp
index d57fa9be..0024cd71 100644
--- a/lib/asn1time.cpp
+++ b/lib/asn1time.cpp
@@ -112,7 +112,7 @@ QString a1time::toSortable() const
         }
 
         return QString("%1-%2-%3 %4").
-		arg(tm.tm_year, 4, 10, c).
+		arg(tm.tm_year +1900, 4, 10, c).
 		arg((unsigned)tm.tm_mon +1, 2, 10, c).
 		arg((unsigned)tm.tm_mday, 2, 10, c).
 		arg(g==1 ? "GMT" : "");
diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
index cfb3839f..4d75f56a 100644
--- a/lib/x509v3ext.cpp
+++ b/lib/x509v3ext.cpp
@@ -108,7 +108,7 @@ QString x509v3ext::getValue() const
 		text = QString::fromLocal8Bit(p, len);
 	}
 	BIO_free(bio);
-	return text;
+	return text.trimmed();
 }
 
 static void *ext_str_new(X509_EXTENSION *ext)
@@ -134,10 +134,16 @@ static void ext_str_free(X509_EXTENSION *ext, void *ext_str)
 		method->ext_free(ext_str);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define C_X509V3_EXT_METHOD const X509V3_EXT_METHOD
+#else
+#define C_X509V3_EXT_METHOD X509V3_EXT_METHOD
+#endif
+
 QString x509v3ext::i2s()
 {
 	QString str;
-	X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+	C_X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
 	void *ext_str = ext_str_new(ext);
 
 	if (!ext_str)
@@ -151,7 +157,7 @@ QString x509v3ext::i2s()
 
 QStringList x509v3ext::i2v()
 {
-	X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+	C_X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
 	void *ext_str = ext_str_new(ext);
 	QStringList sl;