diff --git a/ChangeLog b/ChangeLog
index 0211dfc6b..39f5681c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-02 Paulo Andrade <pcpa@gnu.org>
+
+	* check/float.tst: Correct test case to match ppc also
+	converting positive infinity to 0x7fffffff.
+
+	* lib/jit_arm-swf.c: Correct typos with double underscores.
+
+	* lib/lightning.c: Correct remaining wrong reverse jump logic.
+
 2012-12-29 Paulo Andrade <pcpa@gnu.org>
 
 	* lib/lightning.c: Correct both, wrong and confusing logic
diff --git a/check/float.tst b/check/float.tst
index de5886880..8732f68f6 100644
--- a/check/float.tst
+++ b/check/float.tst
@@ -21,7 +21,7 @@ ok:
 #else
 #  define wnan			x80
 #endif
-#if __mips__ || __arm__
+#if __mips__ || __arm__ || __ppc__
 #  define wpinf			x7f
 #else
 #  define wpinf			x80
diff --git a/lib/jit_arm-swf.c b/lib/jit_arm-swf.c
index 89aefed35..7c37ef2da 100644
--- a/lib/jit_arm-swf.c
+++ b/lib/jit_arm-swf.c
@@ -812,7 +812,7 @@ _swf_iunff_(jit_state_t *_jit, int (*i0)(float, float),
     movi(_R1_REGNO, data.i);
     swf_call(__aeabi_fcmpun, fcmpun, _R2_REGNO);
     if (jit_thumb_p()) {
-	T1_CMPI(__R0_REGNO, 0);
+	T1_CMPI(_R0_REGNO, 0);
 	IT(ARM_CC_NE);
 	if (r0 < 8)
 	    T1_MOVI(r0, 1);
@@ -822,7 +822,7 @@ _swf_iunff_(jit_state_t *_jit, int (*i0)(float, float),
 	T2_CC_B(ARM_CC_NE, 0);
     }
     else {
-	CMPI(__R0_REGNO, 0);
+	CMPI(_R0_REGNO, 0);
 	CC_MOVI(ARM_CC_NE, r0, 1);
 	instr = _jit->pc.w;
 	CC_B(ARM_CC_NE, 0);
@@ -865,7 +865,7 @@ _swf_iundd_(jit_state_t *_jit, int (*i0)(double, double),
     movi(_R3_REGNO, data.i[1]);
     swf_call_with_get_reg(__aeabi_dcmpun, dcmpun);
     if (jit_thumb_p()) {
-	T1_CMPI(__R0_REGNO, 0);
+	T1_CMPI(_R0_REGNO, 0);
 	IT(ARM_CC_NE);
 	if (r0 < 8)
 	    T1_MOVI(r0, 1);
@@ -875,7 +875,7 @@ _swf_iundd_(jit_state_t *_jit, int (*i0)(double, double),
 	T2_CC_B(ARM_CC_NE, 0);
     }
     else {
-	CMPI(__R0_REGNO, 0);
+	CMPI(_R0_REGNO, 0);
 	CC_MOVI(ARM_CC_NE, r0, 1);
 	instr = _jit->pc.w;
 	CC_B(ARM_CC_NE, 0);
diff --git a/lib/lightning.c b/lib/lightning.c
index 853eb2277..c0d4411b5 100644
--- a/lib/lightning.c
+++ b/lib/lightning.c
@@ -1659,7 +1659,7 @@ reverse_jump_code(jit_code_t code)
 	case jit_code_blei_d:	return (jit_code_bungti_d);
 
 	case jit_code_beqr_d:	return (jit_code_bner_d);
-	case jit_code_beqi_d:	return (jit_code_bner_d);
+	case jit_code_beqi_d:	return (jit_code_bnei_d);
 
 	case jit_code_bger_d:	return (jit_code_bunltr_d);
 	case jit_code_bgei_d:	return (jit_code_bunlti_d);