diff --git a/3rdparty/hidapi b/3rdparty/hidapi
index c095a22c53..dd0f541d94 160000
--- a/3rdparty/hidapi
+++ b/3rdparty/hidapi
@@ -1 +1 @@
-Subproject commit c095a22c53f13ccafc54dc59b5c882cd4036afd9
+Subproject commit dd0f541d9410364b35c519bf1857c1409a1b7cc0
diff --git a/Utilities/JIT.cpp b/Utilities/JIT.cpp
index 7a22d33b7c..f9bfd7d390 100644
--- a/Utilities/JIT.cpp
+++ b/Utilities/JIT.cpp
@@ -90,13 +90,13 @@ extern void jit_finalize()
 // Helper class
 struct MemoryManager : llvm::RTDyldMemoryManager
 {
-	std::unordered_map<std::string, std::uintptr_t>& m_link;
+	std::unordered_map<std::string, u64>& m_link;
 
 	std::array<u8, 16>* m_tramps{};
 
 	u8* m_code_addr{}; // TODO
 
-	MemoryManager(std::unordered_map<std::string, std::uintptr_t>& table)
+	MemoryManager(std::unordered_map<std::string, u64>& table)
 		: m_link(table)
 	{
 	}
@@ -371,7 +371,7 @@ public:
 	}
 };
 
-jit_compiler::jit_compiler(const std::unordered_map<std::string, std::uintptr_t>& _link, std::string _cpu)
+jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, std::string _cpu)
 	: m_link(std::move(_link))
 	, m_cpu(std::move(_cpu))
 {
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index a1f5973f82..0652520072 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -87,7 +87,10 @@ endif()
 if(NOT MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
 	# This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts.
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
+	if(NOT APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
+	endif()
+
 	if(WIN32)
 		set(CMAKE_RC_COMPILER_INIT windres)
 		enable_language(RC)
@@ -331,7 +334,9 @@ if(WIN32)
 	target_link_libraries(rpcs3  avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS})
 else()
 	target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
-	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	if(APPLE)
+		target_link_libraries(rpcs3 hidapi-mac "-framework CoreFoundation" "-framework IOKit")
+	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		target_link_libraries(rpcs3 hidapi-hidraw udev vulkan)
 	else()
 		target_link_libraries(rpcs3 hidapi-libusb usb)
diff --git a/rpcs3/Emu/Cell/PPUTranslator.h b/rpcs3/Emu/Cell/PPUTranslator.h
index 24aed77c3a..cefabf306e 100644
--- a/rpcs3/Emu/Cell/PPUTranslator.h
+++ b/rpcs3/Emu/Cell/PPUTranslator.h
@@ -41,7 +41,7 @@ struct TypeGen<T, std::enable_if_t<std::is_void<T>::value>>
 };
 
 template<typename T>
-struct TypeGen<T, std::enable_if_t<std::is_same<T, s64>::value || std::is_same<T, u64>::value>>
+struct TypeGen<T, std::enable_if_t<std::is_same<T, s64>::value || std::is_same<T, u64>::value || std::is_same<T, uptr>::value>>
 {
 	static llvm::Type* get(llvm::LLVMContext& context) { return llvm::Type::getInt64Ty(context); }
 };