diff --git a/c/meterpreter/source/metsrv/server_pivot_named_pipe.c b/c/meterpreter/source/metsrv/server_pivot_named_pipe.c
index 57ab877b..086d9fee 100644
--- a/c/meterpreter/source/metsrv/server_pivot_named_pipe.c
+++ b/c/meterpreter/source/metsrv/server_pivot_named_pipe.c
@@ -755,7 +755,7 @@ DWORD request_core_pivot_add_named_pipe(Remote* remote, Packet* packet)
 			namedPipeServer = ".";
 		}
 
-		UINT pivotIdLen = 0;
+		DWORD pivotIdLen = 0;
 		LPBYTE pivotId = packet_get_tlv_value_raw(packet, TLV_TYPE_PIVOT_ID, &pivotIdLen);
 		if (pivotId != NULL)
 		{
diff --git a/c/meterpreter/workspace/i686-w64-mingw32.cmake b/c/meterpreter/toolsets/i686-w64-mingw32.cmake
similarity index 100%
rename from c/meterpreter/workspace/i686-w64-mingw32.cmake
rename to c/meterpreter/toolsets/i686-w64-mingw32.cmake
diff --git a/c/meterpreter/workspace/x86_64-w64-mingw32.cmake b/c/meterpreter/toolsets/x86_64-w64-mingw32.cmake
similarity index 100%
rename from c/meterpreter/workspace/x86_64-w64-mingw32.cmake
rename to c/meterpreter/toolsets/x86_64-w64-mingw32.cmake