diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index a6391a71be..e70f3cc0a3 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -911,7 +911,7 @@ bool AActor::IsVisibleToPlayer() const
 		return true;
  
 	if (VisibleToTeam != 0 && teamplay &&
-		VisibleToTeam-1 != players[consoleplayer].userinfo.GetTeam())
+		(signed)(VisibleToTeam-1) != players[consoleplayer].userinfo.GetTeam())
 		return false;
 
 	const player_t* pPlayer = players[consoleplayer].camera->player;
diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp
index 7927c0a93c..8120df9688 100644
--- a/src/textures/pngtexture.cpp
+++ b/src/textures/pngtexture.cpp
@@ -297,17 +297,33 @@ FPNGTexture::FPNGTexture (FileReader &lump, int lumpnum, const FString &filename
 	case 0:		// Grayscale
 		if (!bAlphaTexture)
 		{
+			BYTE *GrayMapSrc;
+			switch(BitDepth)
+			{
+				default:
+					GrayMapSrc = GrayMap;
+					break;
+				case 4:
+					GrayMapSrc = GrayMap4bit;
+					break;
+				case 2:
+					GrayMapSrc = GrayMap2bit;
+					break;
+				case 1:
+					GrayMapSrc = GrayMap1bit;
+					break;
+			}
 			if (colortype == 0 && havetRNS && trans[0] != 0)
 			{
 				bMasked = true;
-				PaletteSize = 256;
-				PaletteMap = new BYTE[256];
-				memcpy (PaletteMap, GrayMap, 256);
+				PaletteSize = 1<<BitDepth;
+				PaletteMap = new BYTE[PaletteSize];
+				memcpy (PaletteMap, GrayMapSrc, 256);
 				PaletteMap[trans[0]] = 0;
 			}
 			else
 			{
-				PaletteMap = GrayMap;
+				PaletteMap = GrayMapSrc;
 			}
 		}
 		break;
diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp
index 093bf303b5..eb959c778e 100644
--- a/src/textures/texture.cpp
+++ b/src/textures/texture.cpp
@@ -56,13 +56,29 @@ struct TexCreateInfo
 };
 
 BYTE FTexture::GrayMap[256];
+BYTE FTexture::GrayMap4bit[16];
+BYTE FTexture::GrayMap2bit[4];
+BYTE FTexture::GrayMap1bit[2];
 
 void FTexture::InitGrayMap()
 {
 	for (int i = 0; i < 256; ++i)
 	{
 		GrayMap[i] = ColorMatcher.Pick (i, i, i);
+		if(i < 16)
+		{
+			const int i4 = i|(i<<4);
+			GrayMap4bit[i] = ColorMatcher.Pick (i4, i4, i4);
+		}
+		if(i < 4)
+		{
+			const int i2 = i|(i<<2)|(i<<4)|(i<<6);
+			GrayMap4bit[i] = ColorMatcher.Pick (i2, i2, i2);
+		}
 	}
+
+	GrayMap1bit[0] = ColorMatcher.Pick (0, 0, 0);
+	GrayMap1bit[1] = ColorMatcher.Pick (255, 255, 255);
 }
 
 FTexture *IMGZTexture_TryCreate(FileReader &, int lumpnum);
diff --git a/src/textures/textures.h b/src/textures/textures.h
index 100ba31e9e..a0abaf54f3 100644
--- a/src/textures/textures.h
+++ b/src/textures/textures.h
@@ -283,6 +283,9 @@ public:
 protected:
 	WORD Width, Height, WidthMask;
 	static BYTE GrayMap[256];
+	static BYTE GrayMap4bit[16];
+	static BYTE GrayMap2bit[4];
+	static BYTE GrayMap1bit[2];
 	FNativeTexture *Native;
 
 	FTexture (const char *name = NULL, int lumpnum = -1);
diff --git a/src/v_font.cpp b/src/v_font.cpp
index 0d88a47dff..fad3243e04 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -645,6 +645,7 @@ int FFont::SimpleTranslation (BYTE *colorsused, BYTE *translation, BYTE *reverse
 	qsort (reverse+1, j-1, 1, compare);
 
 	*luminosity = new double[j];
+	(*luminosity)[0] = 0.0; // [BL] Prevent uninitalized memory
 	max = 0.0;
 	min = 100000000.0;
 	for (i = 1; i < j; i++)