diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 5822d43d3286d6102c229f7d4ad39542bdb2e4f7..709ea7c1186acd1f3d9ff12dbdae3741bed07332 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -9941,7 +9941,11 @@ void SMPFunction::EmitAnnotations(FILE *AnnotFile, FILE *InfoAnnotFile) {
 	
 #if ZST_SHADOW_FUNCTION_POINTERS
 	// Emit shadowing annotations.
+#if 1
 	this->EmitFuncPtrShadowingAnnotations(InfoAnnotFile);
+#else
+	this->EmitFuncPtrShadowingAnnotations2(InfoAnnotFile);
+#endif
 #endif
 
 	LoopList.clear();
diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index bf7ac8e83e1108407d5b076e984f12db2efecddc..6e91329e07cbef905656c303fa06c0df3970cfe6 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -18590,7 +18590,7 @@ bool SMPInstr::BuildRTL(void) {
 
 		case STARS_NN_vcvtpd2ps:            // Convert Packed Double-Precision Floating-Point Values to Packed Single-Precision Floating-Point Values
 		case STARS_NN_vcvtph2ps:            // Convert 16-bit FP Values to Single-Precision FP Values
-			return false;
+			return this->BuildMoveRTL(SMP_NULL_OPERATOR);
 			break;
 
 		case STARS_NN_vcvtps2dq:            // Convert Packed Single-Precision Floating-Point Values to Packed Doubleword Integers
@@ -18599,7 +18599,7 @@ bool SMPInstr::BuildRTL(void) {
 
 		case STARS_NN_vcvtps2pd:            // Convert Packed Single-Precision Floating-Point Values to Packed Double-Precision Floating-Point Values
 		case STARS_NN_vcvtps2ph:            // Convert Single-Precision FP value to 16-bit FP value
-			return false;
+			return this->BuildMoveRTL(SMP_NULL_OPERATOR);
 			break;
 
 		case STARS_NN_vcvtsd2si:            // Convert Scalar Double-Precision Floating-Point Value to Doubleword Integer
@@ -18607,7 +18607,7 @@ bool SMPInstr::BuildRTL(void) {
 			break;
 
 		case STARS_NN_vcvtsd2ss:            // Convert Scalar Double-Precision Floating-Point Value to Scalar Single-Precision Floating-Point Value
-			return false;
+			return this->BuildMoveRTL(SMP_NULL_OPERATOR);
 			break;
 
 		case STARS_NN_vcvtsi2sd:            // Convert Doubleword Integer to Scalar Double-Precision Floating-Point Value
@@ -18616,7 +18616,7 @@ bool SMPInstr::BuildRTL(void) {
 			break;
 
 		case STARS_NN_vcvtss2sd:            // Convert Scalar Single-Precision Floating-Point Value to Scalar Double-Precision Floating-Point Value
-			return false;
+			return this->BuildMoveRTL(SMP_NULL_OPERATOR);
 			break;
 
 		case STARS_NN_vcvtss2si:            // Scalar Single-FP to signed INT32 conversion