diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index 2b09d645..d8093d0f 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -9734,7 +9734,7 @@ namespace IDE
 				//mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv");
                 if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) ||
                     (project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication))
-                    mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefMain");
+                    mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefStartProgram");
                 else
 				{
                     mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-main");
@@ -11229,7 +11229,7 @@ namespace IDE
                                 mDebugger.UpdateCallStack();
                                 var stackInfo = scope String();
                                 mDebugger.GetStackFrameInfo(0, out addr, fileName, stackInfo);
-                                if (stackInfo.Contains("Main"))
+                                if (stackInfo.Contains("BeefStartProgram"))
                                 {
 									// Okay, NOW we can do a "step into"
                                     if (!IsInDisassemblyMode())
diff --git a/IDEHelper/CMakeLists.txt b/IDEHelper/CMakeLists.txt
index 207300bd..f312c97a 100644
--- a/IDEHelper/CMakeLists.txt
+++ b/IDEHelper/CMakeLists.txt
@@ -230,6 +230,14 @@ else()
     ${LLVM_LIB}/libLLVMX86AsmParser.a
     ${LLVM_LIB}/libLLVMX86Disassembler.a
 
+    ${LLVM_LIB}/libLLVMARMInfo.a
+    ${LLVM_LIB}/libLLVMARMUtils.a
+    ${LLVM_LIB}/libLLVMARMAsmPrinter.a
+    ${LLVM_LIB}/libLLVMARMDesc.a
+    ${LLVM_LIB}/libLLVMARMCodeGen.a
+    ${LLVM_LIB}/libLLVMARMAsmParser.a
+    ${LLVM_LIB}/libLLVMARMDisassembler.a
+
     ${LLVM_LIB}/libLLVMAArch64Info.a
     ${LLVM_LIB}/libLLVMAArch64Utils.a
     ${LLVM_LIB}/libLLVMAArch64AsmPrinter.a
diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp
index 32d6c1c5..45b63b8a 100644
--- a/IDEHelper/Compiler/BfCompiler.cpp
+++ b/IDEHelper/Compiler/BfCompiler.cpp
@@ -8187,7 +8187,8 @@ BF_EXPORT void BF_CALLTYPE BfCompiler_SetOptions(BfCompiler* bfCompiler, BfProje
 	options->mCLongSize = 4;
 	if ((options->mMachineType == BfMachineType_AArch64) || (options->mMachineType == BfMachineType_x64))
 	{
-		if ((options->mPlatformType == BfPlatformType_macOS) || (options->mPlatformType == BfPlatformType_iOS) || (options->mPlatformType == BfPlatformType_Android))
+		if ((options->mPlatformType == BfPlatformType_macOS) || (options->mPlatformType == BfPlatformType_iOS) || 
+			(options->mPlatformType == BfPlatformType_Linux) || (options->mPlatformType == BfPlatformType_Android))
 			options->mCLongSize = 8;
 	}