diff --git a/src/m_swap.h b/src/m_swap.h
index f5606e59c..ddcf8eaf9 100644
--- a/src/m_swap.h
+++ b/src/m_swap.h
@@ -46,6 +46,11 @@ inline short LittleShort(int x)
 	return OSSwapLittleToHostInt16((uint16_t)x);
 }
 
+inline unsigned short LittleShort(unsigned int x)
+{
+	return OSSwapLittleToHostInt16((uint16_t)x);
+}
+
 inline int LittleLong(int x)
 {
 	return OSSwapLittleToHostInt32((uint32_t)x);
@@ -56,6 +61,16 @@ inline unsigned int LittleLong(unsigned int x)
 	return OSSwapLittleToHostInt32(x);
 }
 
+inline int LittleLong(long x)
+{
+	return OSSwapLittleToHostInt32((uint32_t)x);
+}
+
+inline unsigned int LittleLong(unsigned long x)
+{
+	return OSSwapLittleToHostInt32((uint32_t)x);
+}
+
 inline short BigShort(short x)
 {
 	return (short)OSSwapBigToHostInt16((uint16_t)x);
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 8d6d75237..400b41798 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -70,6 +70,7 @@
 #include "p_spec.h"
 #include "p_checkposition.h"
 #include "serializer.h"
+#include "r_utility.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -1040,11 +1041,11 @@ bool AActor::IsInsideVisibleAngles() const
 	if (players[consoleplayer].camera == nullptr)
 		return true;
 	
-	DAngle anglestart = VisibleStartAngle.Normalized180();
-	DAngle angleend = VisibleEndAngle.Normalized180();
-	DAngle pitchstart = VisibleStartPitch.Normalized180();
-	DAngle pitchend = VisibleEndPitch.Normalized180();
-
+	DAngle anglestart = VisibleStartAngle;
+	DAngle angleend = VisibleEndAngle;
+	DAngle pitchstart = VisibleStartPitch;
+	DAngle pitchend = VisibleEndPitch;
+	
 	if (anglestart > angleend)
 	{
 		DAngle temp = anglestart;
@@ -1052,28 +1053,26 @@ bool AActor::IsInsideVisibleAngles() const
 		angleend = temp;
 	}
 
-	if (pitchstart > angleend)
+	if (pitchstart > pitchend)
 	{
 		DAngle temp = pitchstart;
 		pitchstart = pitchend;
 		pitchend = temp;
 	}
+	
 
-	player_t* pPlayer = players[consoleplayer].camera->player;
+	AActor *mo = players[consoleplayer].camera;
 
-	if (pPlayer && pPlayer->mo)
+	if (mo != nullptr)
 	{
-		AActor *mo = pPlayer->mo;
-		DVector3 diffang = Vec3To(mo);
+		
+		DVector3 diffang = ViewPos - Pos();
 		DAngle to = diffang.Angle();
 
 		if (!(renderflags & RF_ABSMASKANGLE)) 
 			to = deltaangle(Angles.Yaw, to);
 
-		// Note that this check is inversed due to only being able to vectorize
-		// from one way (this actor to the player). It still means to pass
-		// if the player is within the visible angles.
-		if ((to <= anglestart || to >= angleend))
+		if ((to >= anglestart && to <= angleend))
 		{
 			to = diffang.Pitch();
 			if (!(renderflags & RF_ABSMASKPITCH))
diff --git a/src/serializer.cpp b/src/serializer.cpp
index a23459ced..445a3b22b 100644
--- a/src/serializer.cpp
+++ b/src/serializer.cpp
@@ -1294,7 +1294,7 @@ FSerializer &SerializePointer(FSerializer &arc, const char *key, T *&value, T **
 	assert(base != nullptr);
 	if (arc.isReading() || !arc.w->inObject() || defval == nullptr || value != *defval)
 	{
-		ptrdiff_t vv = value == nullptr ? -1 : value - base;
+		int64_t vv = value == nullptr ? -1 : value - base;
 		Serialize(arc, key, vv, nullptr);
 		value = vv < 0 ? nullptr : base + vv;
 	}
diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index 8ada05aa6..927e3e537 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -1437,7 +1437,7 @@ DEFINE_PROPERTY(spriterotation, F, Actor)
 DEFINE_PROPERTY(visibleangles, Ff, Actor)
 {
 	PROP_DOUBLE_PARM(visstart, 0);
-	PROP_DOUBLE_PARM(visend, 0);
+	PROP_DOUBLE_PARM(visend, 1);
 	defaults->VisibleStartAngle = visstart;
 	defaults->VisibleEndAngle = visend;
 }
@@ -1448,7 +1448,7 @@ DEFINE_PROPERTY(visibleangles, Ff, Actor)
 DEFINE_PROPERTY(visiblepitch, Ff, Actor)
 {
 	PROP_DOUBLE_PARM(visstart, 0);
-	PROP_DOUBLE_PARM(visend, 0);
+	PROP_DOUBLE_PARM(visend, 1);
 	defaults->VisibleStartPitch = visstart;
 	defaults->VisibleEndPitch = visend;
 }