diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 240a77378..5534fb14a 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1045,7 +1045,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 			return -1;
 		}
 
-		if ((rawdamage < TELEFRAG_DAMAGE) || (target->flags7 & MF7_LAXTELEFRAGDMG)) // TELEFRAG_DAMAGE may only be reduced with NOTELEFRAGPIERCE or it may not guarantee its effect.
+		if ((rawdamage < TELEFRAG_DAMAGE) || (target->flags7 & MF7_LAXTELEFRAGDMG)) // TELEFRAG_DAMAGE may only be reduced with LAXTELEFRAGDMG or it may not guarantee its effect.
 		{
 			if (player && damage > 1)
 			{
@@ -1221,7 +1221,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 		((player && player != source->player) || (!player && target != source)) &&
 		target->IsTeammate (source))
 	{
-		if (rawdamage < TELEFRAG_DAMAGE) //Use the original damage to check for telefrag amount. Don't let the now-amplified damagetypes do it.
+		//Use the original damage to check for telefrag amount. Don't let the now-amplified damagetypes do it.
+		if (rawdamage < TELEFRAG_DAMAGE || (target->flags7 & MF7_LAXTELEFRAGDMG)) 
 		{ // Still allow telefragging :-(
 			damage = (int)((float)damage * level.teamdamage);
 			if (damage < 0)
diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp
index 5a60933ba..6c5c08a56 100644
--- a/src/p_sectors.cpp
+++ b/src/p_sectors.cpp
@@ -883,7 +883,7 @@ FArchive &operator<< (FArchive &arc, secspecial_t &p)
 {
 	if (SaveVersion < 4529)
 	{
-		short special;
+		int special;
 		arc << special;
 		sector_t sec;
 		P_InitSectorSpecial(&sec, special, true);
diff --git a/src/wildmidi/wildmidi_lib.cpp b/src/wildmidi/wildmidi_lib.cpp
index 0a527ec2a..20857da12 100644
--- a/src/wildmidi/wildmidi_lib.cpp
+++ b/src/wildmidi/wildmidi_lib.cpp
@@ -573,7 +573,7 @@ static inline int wm_isdigit(int c) {
 #define TOKEN_CNT_INC 8
 static char** WM_LC_Tokenize_Line(char *line_data) 
 {
-	int line_length = strlen(line_data);
+	int line_length = (int)strlen(line_data);
 	int token_data_length = 0;
 	int line_ofs = 0;
 	int token_start = 0;