diff --git a/CMakeLists.txt b/CMakeLists.txt
index 795f00953..f37d6a291 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,9 @@ HunterGate(
 )
 project(SuperNET)
 set(DEPS_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_EXTENSIONS Off)
 
 include(cmake/DownloadProject.cmake)
 
diff --git a/iguana/exchanges/CMakeLists.txt b/iguana/exchanges/CMakeLists.txt
index 80704aa15..3621418b7 100644
--- a/iguana/exchanges/CMakeLists.txt
+++ b/iguana/exchanges/CMakeLists.txt
@@ -1,6 +1,12 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 set(MM_SOURCES mm.c ../mini-gmp.c ../groestl.c ../segwit_addr.c ../keccak.c)
-set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-Wl,--allow-multiple-definition")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-Wl,--allow-multiple-definition")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1 "-m")
+endif()
 add_executable(marketmaker-testnet ${MM_SOURCES})
 add_executable(marketmaker-mainnet ${MM_SOURCES})
 include_directories(../../crypto777)
diff --git a/iguana/exchanges/LP_etomic.c b/iguana/exchanges/LP_etomic.c
index c218c1de8..0ed8ca025 100644
--- a/iguana/exchanges/LP_etomic.c
+++ b/iguana/exchanges/LP_etomic.c
@@ -142,7 +142,7 @@ uint8_t LP_etomic_verify_alice_payment(struct basilisk_swap *swap, char *txId)
     }
     EthTxData data = getEthTxData(txId);
     if (strcmp(data.to, ETOMIC_ALICECONTRACT) != 0) {
-        printf("Alice payment %s was not sent to wrong address %s\n", txId, data.to);
+        printf("Alice payment %s was sent to wrong address %s\n", txId, data.to);
         return(0);
     }
     if (strcmp(data.from, swap->I.etomicdest) != 0) {