diff --git a/src/doomdef.h b/src/doomdef.h
index 026498ca14f8500d80ac70e50f3fcc6928d5f791..579030a1ce003134b993db5b581150d915a19269 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -625,7 +625,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 
 /// Sprite rotation
 #define ROTSPRITE
-#define ROTANGLES 360 // Needs to be a divisor of 360 (45, 60, 90, 120...)
+#define ROTANGLES 72 // Needs to be a divisor of 360 (45, 60, 90, 120...)
 #define ROTANGDIFF (360 / ROTANGLES)
 
 #ifndef HAVE_PNG
diff --git a/src/r_patch.c b/src/r_patch.c
index e7ee9dd05a1bf0ea71afe9e1a2dcf05f2fec539d..8d300f041e117f86813dfb1d1a993f2ff4c2a3ca 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -1102,7 +1102,7 @@ static UINT16 GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip)
 	column_t *column;
 	UINT8 *source;
 
-	if (x < SHORT(patch->width))
+	if (x >= 0 && x < SHORT(patch->width))
 	{
 		INT32 topdelta, prevdelta = -1;
 		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[flip ? (patch->width-1-x) : x]));