diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
index a2f193f97e..262dadafb3 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
+++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
@@ -101,10 +101,10 @@ void PPULLVMRecompiler::ReleaseExecutable(u32 address, u32 revision) {
 }
 
 void PPULLVMRecompiler::RequestCompilation(u32 address) {
-        {
-            std::lock_guard<std::mutex> lock(m_uncompiled_shared_lock);
-            m_uncompiled_shared.push_back(address);
-        }
+    {
+        std::lock_guard<std::mutex> lock(m_uncompiled_shared_lock);
+        m_uncompiled_shared.push_back(address);
+    }
 
     if (!IsAlive()) {
         Start();
@@ -4277,12 +4277,12 @@ u8 PPULLVMEmulator::DecodeMemory(const u32 address) {
     auto now = std::chrono::high_resolution_clock::now();
 
     if (std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_cache_clear_time).count() > 1000) {
-        bool       clear_all  = false;
+        bool clear_all  = false;
 
         u32 revision = s_recompiler->GetCurrentRevision();
         if (m_recompiler_revision != revision) {
             m_recompiler_revision = revision;
-            clear_all  = true;
+            clear_all = true;
         }
 
         for (auto iter = m_address_to_executable.begin(); iter != m_address_to_executable.end();) {
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp b/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
index a5b622d31c..d244ef6cfc 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
+++ b/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
@@ -33,7 +33,7 @@ struct PPURegState {
     u64 GPR[32];
 
     /// Vector purpose registers
-    VPR_reg VPR[32];
+    u128 VPR[32];
 
     /// Condition register
     CRhdr CR;
@@ -129,7 +129,7 @@ struct PPURegState {
         std::string ret;
 
         for (int i = 0; i < 32; i++) {
-            ret += fmt::Format("GPR[%02d] = 0x%016llx FPR[%02d] = %16g VPR[%02d] = 0x%s [%s]\n", i, GPR[i], i, FPR[i]._double, i, VPR[i].ToString(true).c_str(), VPR[i].ToString().c_str());
+            ret += fmt::Format("GPR[%02d] = 0x%016llx FPR[%02d] = %16g VPR[%02d] = 0x%s [%s]\n", i, GPR[i], i, FPR[i]._double, i, VPR[i].to_hex().c_str(), VPR[i].to_xyzw().c_str());
         }
 
         for (int i = 0; i < 8; i++) {
@@ -180,8 +180,8 @@ void PPULLVMRecompiler::VerifyInstructionAgainstInterpreter(const char * name, P
 
         if (interp_output_reg_state.ToString() != recomp_output_reg_state.ToString()) {
             msg = std::string("Input register states:\n") + input_reg_state.ToString() +
-                  std::string("\nOutput register states:\n") + recomp_output_reg_state.ToString() +
-                  std::string("\nInterpreter output register states:\n") + interp_output_reg_state.ToString();
+                std::string("\nOutput register states:\n") + recomp_output_reg_state.ToString() +
+                std::string("\nInterpreter output register states:\n") + interp_output_reg_state.ToString();
             return false;
         }
 
@@ -206,7 +206,7 @@ void PPULLVMRecompiler::RunTest(const char * name, std::function<void()> test_ca
     m_ir_builder->SetInsertPoint(block);
 
     test_case();
-    
+
     m_ir_builder->CreateRetVoid();
 
     // Print the IR
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index c6b7eb6950..7d4a01eb8c 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -529,7 +529,7 @@
       <SDLCheck>false</SDLCheck>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -543,7 +543,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -608,7 +608,7 @@ msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug
       <SDLCheck>false</SDLCheck>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>