diff --git a/oscar64/Declaration.cpp b/oscar64/Declaration.cpp
index b359692..dc19398 100644
--- a/oscar64/Declaration.cpp
+++ b/oscar64/Declaration.cpp
@@ -2136,6 +2136,7 @@ Declaration* Declaration::Clone(void)
 	ndec->mStride = mStride;
 	ndec->mStripe = mStripe;
 	ndec->mBits = mBits;
+	ndec->mShift = mShift;
 	ndec->mBase = mBase;
 	ndec->mFlags = mFlags;
 	ndec->mScope = mScope;
@@ -2208,6 +2209,7 @@ Declaration* Declaration::ToStriped(int stripe)
 	ndec->mStride = mStride;
 	ndec->mStripe = stripe;
 	ndec->mBits = mBits;
+	ndec->mShift = mShift;
 	ndec->mFlags = mFlags;
 	ndec->mIdent = mIdent;
 	ndec->mQualIdent = mQualIdent;
@@ -2283,6 +2285,7 @@ Declaration* Declaration::ToVolatileType(void)
 		ndec->mStride = mStride;
 		ndec->mBase = mBase;
 		ndec->mBits = mBits;
+		ndec->mShift = mShift;
 		ndec->mFlags = mFlags | DTF_VOLATILE;
 		ndec->mScope = mScope;
 		ndec->mParams = mParams;
@@ -2339,6 +2342,7 @@ Declaration* Declaration::ToConstType(void)
 		ndec->mStripe = mStripe;
 		ndec->mBase = mBase;
 		ndec->mBits = mBits;
+		ndec->mShift = mShift;
 		ndec->mFlags = mFlags | DTF_CONST;
 		ndec->mScope = mScope;
 		ndec->mParams = mParams;
@@ -2404,6 +2408,7 @@ Declaration* Declaration::ToMutableType(void)
 		ndec->mStripe = mStripe;
 		ndec->mBase = mBase;
 		ndec->mBits = mBits;
+		ndec->mShift = mShift;
 		ndec->mFlags = mFlags | DTF_CONST;
 		ndec->mScope = mScope;
 		ndec->mParams = mParams;
diff --git a/oscar64/InterCode.cpp b/oscar64/InterCode.cpp
index 19be010..26d28c6 100644
--- a/oscar64/InterCode.cpp
+++ b/oscar64/InterCode.cpp
@@ -23433,7 +23433,7 @@ void InterCodeProcedure::Close(void)
 {
 	GrowingTypeArray	tstack(IT_NONE);
 	
-	CheckFunc = !strcmp(mIdent->mString, "moveBy");
+	CheckFunc = !strcmp(mIdent->mString, "shipyard_close");
 	CheckCase = false;
 
 	mEntryBlock = mBlocks[0];
diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index b21fccb..b8709c4 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -53268,7 +53268,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
 
 	mInterProc->mLinkerObject->mNativeProc = this;
 
-	CheckFunc = !strcmp(mIdent->mString, "main");
+	CheckFunc = !strcmp(mIdent->mString, "shipyard_close");
 
 	int	nblocks = proc->mBlocks.Size();
 	tblocks = new NativeCodeBasicBlock * [nblocks];