diff --git a/oscar64/InterCode.cpp b/oscar64/InterCode.cpp
index 0417ea3..21958f7 100644
--- a/oscar64/InterCode.cpp
+++ b/oscar64/InterCode.cpp
@@ -16694,7 +16694,7 @@ void InterCodeBasicBlock::SingleBlockLoopOptimisation(const NumberSet& aliasedPa
 				}
 			}
 
-			if (!hasCall)
+			if (!hasCall && (mProc->mCompilerOptions & COPT_OPTIMIZE_BASIC))
 			{
 				// Check forwarding globals
 
@@ -20831,7 +20831,7 @@ void InterCodeProcedure::Close(void)
 {
 	GrowingTypeArray	tstack(IT_NONE);
 
-	CheckFunc = !strcmp(mIdent->mString, "bmmc_circle_fill");
+	CheckFunc = !strcmp(mIdent->mString, "main");
 	CheckCase = false;
 
 	mEntryBlock = mBlocks[0];