diff --git a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
index 75b000b45..d66fe8b3d 100644
--- a/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
+++ b/TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
@@ -86,12 +86,10 @@ void PushableBlockControl(short itemNumber)
 	short roomNumber;
 
 	int stackIndex; // used for stacked pushables
-	int blockHeight;
-
+	
+	int blockHeight = 1024;
 	if (item->triggerFlags > 64)
 		blockHeight = CLICK(item->triggerFlags - 64);
-	else
-		blockHeight = -(GetBoundsAccurate(item)->Y1);
 
 	// get total height of stack
 	stackIndex = item->itemFlags[1];
@@ -99,9 +97,9 @@ void PushableBlockControl(short itemNumber)
 	{
 		auto stackItem = &g_Level.Items[stackIndex];
 		if (stackItem->triggerFlags > 64)
-			blockHeight += CLICK(stackItem->triggerFlags - 64);
+			blockHeight += CLICK(item->triggerFlags - 64);
 		else
-			blockHeight += -(GetBoundsAccurate(stackItem)->Y1);
+			blockHeight += 1024;
 
 		stackIndex = stackItem->itemFlags[1];
 	}
@@ -399,22 +397,20 @@ void PushableBlockCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
 	FLOOR_INFO* floor = GetFloor(item->pos.xPos, item->pos.yPos - 256, item->pos.zPos, &roomNumber);
 
 	int stackIndex; // used for stacked pushables
-	int blockHeight;
 
+	int blockHeight = 1024;
 	if (item->triggerFlags > 64)
 		blockHeight = CLICK(item->triggerFlags - 64);
-	else
-		blockHeight = -(GetBoundsAccurate(item)->Y1);
 
 	// get total height of stack
 	stackIndex = item->itemFlags[1];
-	while (stackIndex != NO_ITEM)
+	while (stackIndex != NO_ITEM) 
 	{
 		auto stackItem = &g_Level.Items[stackIndex];
 		if (stackItem->triggerFlags > 64)
-			blockHeight += CLICK(stackItem->triggerFlags - 64);
+			blockHeight += CLICK(item->triggerFlags - 64);
 		else
-			blockHeight += -(GetBoundsAccurate(stackItem)->Y1);
+			blockHeight += 1024;
 
 		stackIndex = stackItem->itemFlags[1];
 	}
diff --git a/TR5Main/Specific/winmain.cpp b/TR5Main/Specific/winmain.cpp
index 5bbf79700..a6d5c7db5 100644
--- a/TR5Main/Specific/winmain.cpp
+++ b/TR5Main/Specific/winmain.cpp
@@ -253,7 +253,7 @@ LRESULT CALLBACK WinAppProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
 	if constexpr (DebugBuild)
-	//getCurrentCommit();
+	getCurrentCommit();
 	int RetVal;
 	int n;
 
diff --git a/TR5Main/TR5Main.vcxproj b/TR5Main/TR5Main.vcxproj
index a1a0349d5..c0ef9d5a5 100644
--- a/TR5Main/TR5Main.vcxproj
+++ b/TR5Main/TR5Main.vcxproj
@@ -15,14 +15,14 @@
     <ProjectGuid>{15AB0220-541C-4DA1-94EB-ED3C47E4582E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TR5Main</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
diff --git a/TR5Main/TR5Main.vcxproj.user b/TR5Main/TR5Main.vcxproj.user
index 62c3a8edf..3c0e4c59c 100644
--- a/TR5Main/TR5Main.vcxproj.user
+++ b/TR5Main/TR5Main.vcxproj.user
@@ -5,9 +5,9 @@
     <RESOURCE_FILE>Resources.rc</RESOURCE_FILE>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommand>C:\Users\Krystian\Documents\TR5Main\TR5Main.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>Tr5Main.exe</LocalDebuggerCommand>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerWorkingDirectory>..\..\..\TR5Main</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Build\</LocalDebuggerWorkingDirectory>
     <LocalDebuggerCommandArguments>/debug</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">