diff --git a/include/interfaces/irdb/STARSInstruction.h b/include/interfaces/irdb/STARSInstruction.h
index 68bd56604ea98bc024ae9c652dfce49926057238..1702e6829664843aaa0ab2b0b93cd9f54da61fcf 100644
--- a/include/interfaces/irdb/STARSInstruction.h
+++ b/include/interfaces/irdb/STARSInstruction.h
@@ -29,7 +29,8 @@ class STARS_IRDB_Instruction_t : public STARS_Instruction_t
 			disasm.Argument3.ArgType=NO_ARGUMENT;
 			disasm.Argument4.ArgType=NO_ARGUMENT;
 			strcpy(disasm.Instruction.Mnemonic, "fnop ");	// set to fnop
-			IDAOpcodeCached = false;
+			IDAOpcode = STARS_NN_fnop;
+			IDAOpcodeCached = true;
 		};
 
 		// Constructors and destructors
diff --git a/include/interfaces/irdb/STARSSSAInstruction.h b/include/interfaces/irdb/STARSSSAInstruction.h
index c9885549f49013ce93fe85472b28257c5435b4fd..cf97ee6873f0de49c764b8bc059d8cb78244f1f9 100644
--- a/include/interfaces/irdb/STARSSSAInstruction.h
+++ b/include/interfaces/irdb/STARSSSAInstruction.h
@@ -59,13 +59,13 @@ class STARS_SSA_Instruction_t : public STARS_Instruction_t
 		// Operand creation methods
 		virtual STARSOpndTypePtr MakeVoidOpnd(void) const { assert(0); }
 		virtual STARSOpndTypePtr MakeImmediateOpnd(STARS_uval_t value) const { assert(0); }
-		virtual STARSOpndTypePtr MakeRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeFloatingPointRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMMXRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeXMMRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeYMMRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMemDisplacementOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor, STARS_ea_t offset) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMemPhraseOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor) const { assert(0); }
+		virtual STARSOpndTypePtr MakeRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeFloatingPointRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeMMXRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeXMMRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeYMMRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeMemDisplacementOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor, STARS_ea_t offset) { assert(0); }
+		virtual STARSOpndTypePtr MakeMemPhraseOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor) { assert(0); }
 
 		// Analysis methods