diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 19b0e07c6b981c5e479e9b6159b1cb368dbbbaa9..4b89a79ed3b1fd8ac9ea675960158bd51341f6cb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -398,9 +398,9 @@ if(${SRB2_CONFIG_HAVE_CURL})
 		set(CURL_FOUND ON)
 		set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl)
 		if(${SRB2_SYSTEM_BITS} EQUAL 64)
-			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
-		else() # 32-bit
 			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
+		else() # 32-bit
+			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
 		endif()
 	else()
 		find_package(CURL)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f25bcf7b8d72fe0086c30a1a9bb3667febcc03b1..817fb93a0faf7208eaf723b2f138666e3254a764 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1449,7 +1449,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 		// If there's an encoding error, send nothing, we accept that the above may be truncated
 		strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
 
-	netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = 0;
+	netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
 #endif
 
 	p = PutFileNeeded(0);