diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index 4ca4a519c..5c0ba7ae1 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -240,7 +240,7 @@ DBaseStatusBar::DBaseStatusBar (int reltop, int hres, int vres)
 
 void DBaseStatusBar::Destroy ()
 {
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *msg = Messages[i];
 		while (msg)
@@ -342,7 +342,7 @@ void DBaseStatusBar::MultiplayerChanged ()
 
 void DBaseStatusBar::Tick ()
 {
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *msg = Messages[i];
 		DHUDMessage **prev = &Messages[i];
@@ -424,7 +424,7 @@ void DBaseStatusBar::AttachMessage (DHUDMessage *msg, DWORD id, int layer)
 
 DHUDMessage *DBaseStatusBar::DetachMessage (DHUDMessage *msg)
 {
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *probe = Messages[i];
 		DHUDMessage **prev = &Messages[i];
@@ -451,7 +451,7 @@ DHUDMessage *DBaseStatusBar::DetachMessage (DHUDMessage *msg)
 
 DHUDMessage *DBaseStatusBar::DetachMessage (DWORD id)
 {
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *probe = Messages[i];
 		DHUDMessage **prev = &Messages[i];
@@ -484,7 +484,7 @@ DHUDMessage *DBaseStatusBar::DetachMessage (DWORD id)
 
 void DBaseStatusBar::DetachAllMessages ()
 {
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *probe = Messages[i];
 
@@ -1627,7 +1627,7 @@ void DBaseStatusBar::Serialize (FArchive &arc)
 	}
 	else
 	{
-		for (int i = 0; i < countof(Messages); ++i)
+		for (unsigned int i = 0; i < countof(Messages); ++i)
 		{
 			arc << Messages[i];
 		}
@@ -1639,7 +1639,7 @@ void DBaseStatusBar::ScreenSizeChanged ()
 	st_scale.Callback ();
 	SB_state = screen->GetPageCount ();
 
-	for (int i = 0; i < countof(Messages); ++i)
+	for (unsigned int i = 0; i < countof(Messages); ++i)
 	{
 		DHUDMessage *message = Messages[i];
 		while (message != NULL)
diff --git a/src/resourcefiles/file_wad.cpp b/src/resourcefiles/file_wad.cpp
index 1ea7b39ce..ea9ea77fd 100644
--- a/src/resourcefiles/file_wad.cpp
+++ b/src/resourcefiles/file_wad.cpp
@@ -354,7 +354,7 @@ bool FWadFile::Open(bool quiet)
 	{
 		uppercopy (Lumps[i].Name, fileinfo[i].Name);
 		Lumps[i].Name[8] = 0;
-		Lumps[i].Compressed = Lumps[i].Name[0] & 0x80;
+		Lumps[i].Compressed = (Lumps[i].Name[0] & 0x80) == 0x80;
 		Lumps[i].Name[0] &= ~0x80;
 
 		Lumps[i].Owner = this;