diff --git a/Jamfile b/Jamfile
index 5e1a90f..569caec 100644
--- a/Jamfile
+++ b/Jamfile
@@ -59,7 +59,7 @@ alias usrsctp
     : # no default build
     : # usage requirements
     <include>./deps/usrsctp/usrsctplib
-    <library>libusrsctp.lib
+    <library>usrsctp.lib
     ;
 
 alias juice
@@ -77,11 +77,11 @@ alias juice
     : # no default build
     : # usage requirements
     <include>./deps/libjuice/include
-    <library>libjuice-static.lib
+    <library>juice-static.lib
     ;
 
 make libusrsctp.a : : @make_libusrsctp ;
-make libusrsctp.lib : : @make_libusrsctp_msvc ;
+make usrsctp.lib : : @make_libusrsctp_msvc ;
 
 actions make_libusrsctp
 {
@@ -90,12 +90,17 @@ actions make_libusrsctp
 }
 actions make_libusrsctp_msvc
 {
-    (cd $(CWD)/deps/usrsctp && cmake -B build -G "Visual Studio 16 2019" && cd build && msbuild usrsctplib.sln)
-    cp $(CWD)/deps/usrsctp/build/usrsctplib/libusrsctp.lib $(<)
+	SET OLDD=%CD%
+    cd $(CWD)/deps/usrsctp
+    cmake -B build -G "Visual Studio 16 2019"
+    cd build
+    msbuild usrsctplib.sln /property:Configuration=Release
+    cd %OLDD%
+    cp $(CWD)/deps/usrsctp/build/usrsctplib/Release/usrsctp.lib $(<)
 }
 
 make libjuice-static.a : : @make_libjuice ;
-make libjuice-static.lib : : @make_libjuice_msvc ;
+make juice-static.lib : : @make_libjuice_msvc ;
 
 rule make_libjuice ( targets * : sources * : properties * )
 {
@@ -126,8 +131,13 @@ rule make_libjuice_msvc ( targets * : sources * : properties * )
 }
 actions make_libjuice_msvc
 {
-    (cd $(CWD)/deps/libjuice && cmake -B build -G "Visual Studio 16 2019" $(CMAKEOPTS) && cd build && msbuild libjuice.sln)
-    cp $(CWD)/deps/libjuice/build/libjuice-static.lib $(<)
+	SET OLDD=%CD%
+    cd $(CWD)/deps/libjuice
+    cmake -B build -G "Visual Studio 16 2019" $(CMAKEOPTS)
+    cd build
+    msbuild libjuice.sln /property:Configuration=Release
+    cd %OLDD%
+    cp $(CWD)/deps/libjuice/build/Release/juice-static.lib $(<)
 }
 
 # the search path to pick up the openssl libraries from. This is the <search>
@@ -182,7 +192,7 @@ rule openssl-include-path ( properties * )
     return $(result) ;
 }
 
-# libraries for openssl on windows
+# libraries for OpenSSL on Windows
 lib advapi32 : : <name>advapi32 ;
 lib user32 : : <name>user32 ;
 lib shell32 : : <name>shell32 ;
@@ -191,19 +201,13 @@ lib bcrypt : : <name>bcrypt ;
 lib z : : <link>shared <name>z ;
 alias ssl-deps : advapi32 user32 shell32 gdi32 ;
 
-# pre OpenSSL 1.1 windows
-lib crypto : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>libeay32
-    <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
-lib ssl : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>ssleay32
-    <use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
-
-# OpenSSL 1.1+ windows
+# OpenSSL on Windows
 lib crypto : ssl-deps : <toolset>msvc <openssl-version>1.1 <name>libcrypto
     <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
 lib ssl : ssl-deps : <toolset>msvc <openssl-version>1.1 <name>libssl <use>crypto
     <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
 
-# generic OpenSSL
+# OpenSSL on other platforms
 lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : :
     <conditional>@openssl-include-path ;
 lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : :
diff --git a/src/dtlstransport.cpp b/src/dtlstransport.cpp
index 22fcee8..049cc4f 100644
--- a/src/dtlstransport.cpp
+++ b/src/dtlstransport.cpp
@@ -308,7 +308,8 @@ DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, shared_ptr<Certific
 	PLOG_DEBUG << "Initializing DTLS transport (OpenSSL)";
 
 	try {
-		if (!(mCtx = SSL_CTX_new(DTLS_method())))
+		mCtx = SSL_CTX_new(DTLS_method());
+		if (!mCtx)
 			throw std::runtime_error("Failed to create SSL context");
 
 		openssl::check(SSL_CTX_set_cipher_list(mCtx, "ALL:!LOW:!EXP:!RC4:!MD5:@STRENGTH"),
@@ -332,7 +333,8 @@ DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, shared_ptr<Certific
 
 		openssl::check(SSL_CTX_check_private_key(mCtx), "SSL local private key check failed");
 
-		if (!(mSsl = SSL_new(mCtx)))
+		mSsl = SSL_new(mCtx);
+		if (!mSsl)
 			throw std::runtime_error("Failed to create SSL instance");
 
 		SSL_set_ex_data(mSsl, TransportExIndex, this);
@@ -342,7 +344,9 @@ DtlsTransport::DtlsTransport(shared_ptr<IceTransport> lower, shared_ptr<Certific
 		else
 			SSL_set_accept_state(mSsl);
 
-		if (!(mInBio = BIO_new(BIO_s_mem())) || !(mOutBio = BIO_new(BioMethods)))
+		mInBio = BIO_new(BIO_s_mem());
+		mOutBio = BIO_new(BioMethods);
+		if (!mInBio || !mOutBio)
 			throw std::runtime_error("Failed to create BIO");
 
 		BIO_set_mem_eof_return(mInBio, BIO_EOF);
@@ -494,7 +498,7 @@ void DtlsTransport::runRecvLoop() {
 	}
 }
 
-int DtlsTransport::CertificateCallback(int preverify_ok, X509_STORE_CTX *ctx) {
+int DtlsTransport::CertificateCallback(int /*preverify_ok*/, X509_STORE_CTX *ctx) {
 	SSL *ssl =
 	    static_cast<SSL *>(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()));
 	DtlsTransport *t =
@@ -543,7 +547,7 @@ int DtlsTransport::BioMethodWrite(BIO *bio, const char *in, int inl) {
 	return inl; // can't fail
 }
 
-long DtlsTransport::BioMethodCtrl(BIO *bio, int cmd, long num, void *ptr) {
+long DtlsTransport::BioMethodCtrl(BIO * /*bio*/, int cmd, long /*num*/, void * /*ptr*/) {
 	switch (cmd) {
 	case BIO_CTRL_FLUSH:
 		return 1;