diff --git a/VTIL-Compiler/VTIL-Compiler.vcxproj b/VTIL-Compiler/VTIL-Compiler.vcxproj
index 39d1c1ae..176f49be 100644
--- a/VTIL-Compiler/VTIL-Compiler.vcxproj
+++ b/VTIL-Compiler/VTIL-Compiler.vcxproj
@@ -211,6 +211,7 @@
   <ItemGroup>
     <ClCompile Include="common\auxiliaries.cpp" />
     <ClCompile Include="optimizer\bblock_extension_pass.cpp" />
+    <ClCompile Include="optimizer\bblock_thunk_removal_pass.cpp" />
     <ClCompile Include="optimizer\branch_correction_pass.cpp" />
     <ClCompile Include="optimizer\dead_code_elimination_pass.cpp" />
     <ClCompile Include="optimizer\fast_dead_code_elimination_pass.cpp" />
@@ -230,6 +231,7 @@
     <ClInclude Include="common\interface.hpp" />
     <ClInclude Include="includes\vtil\optimizer-tests" />
     <ClInclude Include="optimizer\bblock_extension_pass.hpp" />
+    <ClInclude Include="optimizer\bblock_thunk_removal_pass.hpp" />
     <ClInclude Include="optimizer\branch_correction_pass.hpp" />
     <ClInclude Include="optimizer\dead_code_elimination_pass.hpp" />
     <ClInclude Include="optimizer\fast_dead_code_elimination_pass.hpp" />
diff --git a/VTIL-Compiler/VTIL-Compiler.vcxproj.filters b/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
index 1b4e196c..4b9c6deb 100644
--- a/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
+++ b/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
@@ -44,6 +44,9 @@
     <ClCompile Include="optimizer\fast_propagation_pass.cpp">
       <Filter>Optimization Passes</Filter>
     </ClCompile>
+    <ClCompile Include="optimizer\bblock_thunk_removal_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Includes">
@@ -114,6 +117,9 @@
     <ClInclude Include="validation\unit_test.hpp">
       <Filter>Validation</Filter>
     </ClInclude>
+    <ClInclude Include="optimizer\bblock_thunk_removal_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="VTIL-Compiler.licenseheader" />
diff --git a/VTIL-SymEx/expressions/expression.cpp b/VTIL-SymEx/expressions/expression.cpp
index 4f68ec28..3bc4f3ec 100644
--- a/VTIL-SymEx/expressions/expression.cpp
+++ b/VTIL-SymEx/expressions/expression.cpp
@@ -548,15 +548,10 @@ namespace vtil::symbolic
 					}
 					case math::operator_id::shift_left:
 					case math::operator_id::shift_right:
-					{
-						rhs.resize( sizeof(uintptr_t), false );
-						break;
-					}
-					
 					case math::operator_id::rotate_left:
 					case math::operator_id::rotate_right:
 					{
-						rhs.resize( sizeof(uintptr_t), false );
+						rhs.resize( 32, false );
 						break;
 					}
 					case math::operator_id::multiply_high: