diff --git a/src/cmdlib.cpp b/src/cmdlib.cpp
index ecb2608f..e3766fd0 100644
--- a/src/cmdlib.cpp
+++ b/src/cmdlib.cpp
@@ -600,18 +600,20 @@ int strbin (char *str)
 				case 'x':
 				case 'X':
 					c = 0;
-					p++;
-					for (i = 0; i < 2; i++) {
-						c <<= 4;
-						if (*p >= '0' && *p <= '9')
-							c += *p-'0';
-						else if (*p >= 'a' && *p <= 'f')
-							c += 10 + *p-'a';
-						else if (*p >= 'A' && *p <= 'F')
-							c += 10 + *p-'A';
-						else
-							break;
+					for (i = 0; i < 2; i++)
+					{
 						p++;
+						if (*p >= '0' && *p <= '9')
+							c = (c << 4) + *p-'0';
+						else if (*p >= 'a' && *p <= 'f')
+							c = (c << 4) + 10 + *p-'a';
+						else if (*p >= 'A' && *p <= 'F')
+							c = (c << 4) + 10 + *p-'A';
+						else
+						{
+							p--;
+							break;
+						}
 					}
 					*str++ = c;
 					break;
@@ -698,18 +700,20 @@ FString strbin1 (const char *start)
 				case 'x':
 				case 'X':
 					c = 0;
-					p++;
-					for (i = 0; i < 2; i++) {
-						c <<= 4;
-						if (*p >= '0' && *p <= '9')
-							c += *p-'0';
-						else if (*p >= 'a' && *p <= 'f')
-							c += 10 + *p-'a';
-						else if (*p >= 'A' && *p <= 'F')
-							c += 10 + *p-'A';
-						else
-							break;
+					for (i = 0; i < 2; i++)
+					{
 						p++;
+						if (*p >= '0' && *p <= '9')
+							c = (c << 4) + *p-'0';
+						else if (*p >= 'a' && *p <= 'f')
+							c = (c << 4) + 10 + *p-'a';
+						else if (*p >= 'A' && *p <= 'F')
+							c = (c << 4) + 10 + *p-'A';
+						else
+						{
+							p--;
+							break;
+						}
 					}
 					result << c;
 					break;
diff --git a/src/g_strife/a_strifeitems.cpp b/src/g_strife/a_strifeitems.cpp
index 5bf6c2ca..6771080d 100644
--- a/src/g_strife/a_strifeitems.cpp
+++ b/src/g_strife/a_strifeitems.cpp
@@ -177,7 +177,7 @@ IMPLEMENT_CLASS (ARaiseAlarm)
 bool ARaiseAlarm::TryPickup (AActor *&toucher)
 {
 	P_NoiseAlert (toucher, toucher);
-	// A_WakeOracleSpectre (dword312F4);
+	CALL_ACTION(A_WakeOracleSpectre, toucher);
 	GoAwayAndDie ();
 	return true;
 }
diff --git a/src/r_utility.cpp b/src/r_utility.cpp
index eb9ae952..9b13c2a4 100644
--- a/src/r_utility.cpp
+++ b/src/r_utility.cpp
@@ -815,7 +815,6 @@ void R_SetupFrame (AActor *actor)
 	viewangle = TEST_ANGLE;
 #endif
 
-	Renderer->CopyStackedViewParameters();
 	R_SetViewAngle ();
 
 	interpolator.DoInterpolations (r_TicFrac);
@@ -911,6 +910,7 @@ void R_SetupFrame (AActor *actor)
 		}
 	}
 
+	Renderer->CopyStackedViewParameters();
 	Renderer->SetupFrame(player);
 
 	validcount++;
diff --git a/src/svnrevision.h b/src/svnrevision.h
index 8ae4e07e..2c9abc3b 100644
--- a/src/svnrevision.h
+++ b/src/svnrevision.h
@@ -3,5 +3,5 @@
 // This file was automatically generated by the
 // updaterevision tool. Do not edit by hand.
 
-#define ZD_SVN_REVISION_STRING "3624"
-#define ZD_SVN_REVISION_NUMBER 3624
+#define ZD_SVN_REVISION_STRING "3627"
+#define ZD_SVN_REVISION_NUMBER 3627