diff --git a/include/base/SMPInstr.h b/include/base/SMPInstr.h
index 9b72fc8a2712496fc2a28c36525f77fc26531853..39189f3eee51415773c0b911bc6d32312a861f4c 100644
--- a/include/base/SMPInstr.h
+++ b/include/base/SMPInstr.h
@@ -43,7 +43,6 @@
 
 #include "base/SMPDataFlowAnalysis.h"
 #include "interfaces/abstract/STARSInstruction.h"
-//#include "interfaces/idapro/STARSInstruction.h"
 
 class SMPProgram;
 
diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index ca812f6385b4d26ad69f3e8595ae4afa5ee8be6f..85da09458fea25c725738c2599ea23043eb7a1e3 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -342,10 +342,10 @@ void SMPInstr::PrintSPARKAdaOperand(const STARSOpndTypePtr &Opnd, FILE *OutFile,
 		if (Opnd->HasSIBByte()) {
 			SMP_fprintf(OutFile, " %s ", MemWriteString);
 			SPARKAnnotPrintSIB(Opnd, true, OutFile, Opnd->GetSegReg(), UseFP);
-			SMP_fprintf(OutFile, " + %llx )", (unsigned long long) Opnd->GetAddr());
+			SMP_fprintf(OutFile, " + 16\#%llx\# )", (unsigned long long) Opnd->GetAddr());
 		}
 		else {
-			SMP_fprintf(OutFile, " %s %llx ", MemWriteString, (unsigned long long) Opnd->GetAddr());
+			SMP_fprintf(OutFile, " %s 16\#%llx\# ", MemWriteString, (unsigned long long) Opnd->GetAddr());
 		}
 		if (SubwordWidth) {
 			++SubwordMemCount;
@@ -429,7 +429,7 @@ void SMPInstr::PrintSPARKAdaOperand(const STARSOpndTypePtr &Opnd, FILE *OutFile,
 		SMP_fprintf(OutFile, " %ld ", (long) Opnd->GetImmedValue());
 	}
 	else if (Opnd->IsFarPointer() || Opnd->IsNearPointer()) {
-		SMP_fprintf(OutFile, " %lx ", (unsigned long) Opnd->GetAddr());
+		SMP_fprintf(OutFile, " 16\#%llx\# ", (unsigned long long) Opnd->GetAddr());
 	}
 	else {
 		SMP_fprintf(OutFile, " ERROROP");