diff --git a/src/enums.h b/src/enums.h
index c0f8d11748..f6e6b66bca 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -632,7 +632,7 @@ struct Reflect {
 
 	Reflect& operator+=(const Reflect& other) {
 		percent += other.percent;
-		chance = std::min(100, chance + other.chance);
+		chance = std::min<uint16_t>(100, chance + other.chance);
 		return *this;
 	}
 
diff --git a/src/groups.cpp b/src/groups.cpp
index fbfe7475bd..5e8b475a87 100644
--- a/src/groups.cpp
+++ b/src/groups.cpp
@@ -61,7 +61,7 @@ bool Groups::load()
 
 	for (auto groupNode : doc.child("groups").children()) {
 		Group group;
-		group.id = pugi::cast<uint32_t>(groupNode.attribute("id").value());
+		group.id = pugi::cast<uint16_t>(groupNode.attribute("id").value());
 		group.name = groupNode.attribute("name").as_string();
 		group.access = groupNode.attribute("access").as_bool();
 		group.maxDepotItems = pugi::cast<uint32_t>(groupNode.attribute("maxdepotitems").value());
diff --git a/src/player.h b/src/player.h
index 8571aa0642..81192e5219 100644
--- a/src/player.h
+++ b/src/player.h
@@ -481,7 +481,7 @@ class Player final : public Creature, public Cylinder
 			varSpecialSkills[skill] += modifier;
 		}
 
-		void setSpecialMagicLevelSkill(CombatType_t type, int32_t modifier) {
+		void setSpecialMagicLevelSkill(CombatType_t type, int16_t modifier) {
 			specialMagicLevelSkill[combatTypeToIndex(type)] += modifier;
 		}
 
@@ -595,10 +595,10 @@ class Player final : public Creature, public Cylinder
 		}
 
 		uint16_t getSpecialSkill(uint8_t skill) const {
-			return std::max<int32_t>(0, varSpecialSkills[skill]);
+			return std::max<uint16_t>(0, varSpecialSkills[skill]);
 		}
 		uint16_t getSkillLevel(uint8_t skill) const {
-			return std::max<int32_t>(0, skills[skill].level + varSkills[skill]);
+			return std::max<uint16_t>(0, skills[skill].level + varSkills[skill]);
 		}
 		uint16_t getSpecialMagicLevelSkill(CombatType_t type) const {
 			return std::max<int32_t>(0, specialMagicLevelSkill[combatTypeToIndex(type)]);
diff --git a/src/position.h b/src/position.h
index 7a30f1efbf..411f40340a 100644
--- a/src/position.h
+++ b/src/position.h
@@ -56,7 +56,7 @@ struct Position
 		return std::abs(Position::getOffsetY(p1, p2));
 	}
 	static int16_t getDistanceZ(const Position& p1, const Position& p2) {
-		return std::abs(Position::getOffsetZ(p1, p2));
+		return static_cast<int16_t>(std::abs(Position::getOffsetZ(p1, p2)));
 	}
 
 	uint16_t x = 0;
diff --git a/src/tile.h b/src/tile.h
index 0eb5b8b7d9..fa75b5eae5 100644
--- a/src/tile.h
+++ b/src/tile.h
@@ -121,7 +121,7 @@ class TileItemVector : private ItemVector
 			}
 			return *getBeginDownItem();
 		}
-		void addDownItemCount(int32_t increment) {
+		void addDownItemCount(uint16_t increment) {
 			downItemCount += increment;
 		}