diff --git a/oscar64/Compiler.cpp b/oscar64/Compiler.cpp
index 3e899a1..61328c7 100644
--- a/oscar64/Compiler.cpp
+++ b/oscar64/Compiler.cpp
@@ -1183,11 +1183,14 @@ bool Compiler::WriteDbjFile(const char* filename)
 				Declaration* mdec = dec->mParams;
 				while (mdec)
 				{
-					if (!tfirst)
-						fprintf(file, ",\n");
-					tfirst = false;
+					if (mdec->mIdent)
+					{
+						if (!tfirst)
+							fprintf(file, ",\n");
+						tfirst = false;
 
-					fprintf(file, "\t\t\t{\"name\": \"%s\", \"value\": %d}", mdec->mIdent->mString, int(mdec->mInteger));
+						fprintf(file, "\t\t\t{\"name\": \"%s\", \"value\": %d}", mdec->mIdent->mString, int(mdec->mInteger));
+					}
 
 					mdec = mdec->mNext;
 				}
diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index 59b3388..514da85 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -28173,6 +28173,9 @@ bool NativeCodeBasicBlock::OptimizeSimpleLoopInvariant(NativeCodeProcedure* proc
 		{
 			if (!prevBlock)
 				return OptimizeSimpleLoopInvariant(proc, full);
+			mExitRequiredRegs += CPU_REG_Y;
+			exitBlock->mEntryRequiredRegs += CPU_REG_Y;
+
 			exitBlock->mIns.Insert(0, mIns[ei]);
 			mIns.Remove(ei);
 
@@ -29500,6 +29503,10 @@ bool NativeCodeBasicBlock::OptimizeSimpleLoop(NativeCodeProcedure * proc, bool f
 		assert(mBranch != ASMIT_JMP || mFalseJump == nullptr);
 
 		CheckLive();
+		if (mTrueJump)
+			mTrueJump->CheckLive();
+		if (mFalseJump)
+			mFalseJump->CheckLive();
 
 #if 1
 		if (sz > 3 &&
@@ -30226,6 +30233,8 @@ bool NativeCodeBasicBlock::OptimizeInnerLoop(NativeCodeProcedure* proc, NativeCo
 				tail->mEntryRequiredRegs += CPU_REG_Y;
 				tail->mExitRequiredRegs += CPU_REG_Y;
 				head->mExitRequiredRegs += CPU_REG_Y;
+				eblock->mEntryRequiredRegs = tail->mExitRequiredRegs;
+				eblock->mEntryRequiredRegs += CPU_REG_Y;
 
 				lblock->CheckLive();
 
@@ -39225,7 +39234,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
 {
 	mInterProc = proc;
 
-	CheckFunc = !strcmp(mInterProc->mIdent->mString, "iec_read");
+	CheckFunc = !strcmp(mInterProc->mIdent->mString, "rirq_build");
 
 	int	nblocks = proc->mBlocks.Size();
 	tblocks = new NativeCodeBasicBlock * [nblocks];
diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp
index 9212c2b..64c2aa0 100644
--- a/oscar64/Parser.cpp
+++ b/oscar64/Parser.cpp
@@ -333,13 +333,13 @@ Declaration* Parser::ParseBaseTypeDeclaration(uint64 flags)
 					else if (cdec->mInteger > maxValue)
 						maxValue = cdec->mInteger;
 
+					cdec->mNext = dec->mParams;
+					dec->mParams = cdec;
+
 					if (mScanner->mToken == TK_COMMA)
 						mScanner->NextToken();
 					else
 						break;
-
-					cdec->mNext = dec->mParams;
-					dec->mParams = cdec;
 				}
 
 				dec->mMinValue = minValue;