diff --git a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
index 32d8687866cf274612d342d2937bdcca69c6d738..ecc607336d6739e81093d537c91a5a60bb442005 100644
--- a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
+++ b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
@@ -18,9 +18,9 @@
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLCertificate.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
-
+#ifndef _MSC_VER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
-
+#endif
 namespace Swift {
 
 static const int MAX_FINISHED_SIZE = 4096;
@@ -50,7 +50,7 @@ OpenSSLServerContext::OpenSSLServerContext() : state_(Start), context_(0), handl
 			if (!certContext) {
 				break;
 			}
-			ByteArray certData(certContext->pbCertEncoded, certContext->cbCertEncoded);
+			ByteArray certData(createByteArray(certContext->pbCertEncoded, certContext->cbCertEncoded));
 			OpenSSLCertificate cert(certData);
 			if (store && cert.getInternalX509()) {
 				X509_STORE_add_cert(store, cert.getInternalX509().get());