diff --git a/GPU/Software/BinManager.cpp b/GPU/Software/BinManager.cpp
index faaf7b03a8..9c1c1ff3ef 100644
--- a/GPU/Software/BinManager.cpp
+++ b/GPU/Software/BinManager.cpp
@@ -166,7 +166,7 @@ void BinManager::UpdateState(bool throughMode) {
 	if (HasDirty(SoftDirty::PIXEL_ALL | SoftDirty::SAMPLER_ALL | SoftDirty::RAST_ALL)) {
 		if (states_.Full())
 			Flush("states");
-		stateIndex_ = (int)states_.Push(RasterizerState());
+		stateIndex_ = (uint16_t)states_.Push(RasterizerState());
 		ComputeRasterizerState(&states_[stateIndex_], throughMode);
 		states_[stateIndex_].samplerID.cached.clut = cluts_[clutIndex_].readable;
 
@@ -312,7 +312,7 @@ void BinManager::UpdateClut(const void *src) {
 	PROFILE_THIS_SCOPE("bin_clut");
 	if (cluts_.Full())
 		Flush("cluts");
-	clutIndex_ = (int)cluts_.Push(BinClut());
+	clutIndex_ = (uint16_t)cluts_.Push(BinClut());
 	memcpy(cluts_[clutIndex_].readable, src, sizeof(BinClut));
 }
 
diff --git a/GPU/Software/BinManager.h b/GPU/Software/BinManager.h
index 1d628aa8e4..79146eae1d 100644
--- a/GPU/Software/BinManager.h
+++ b/GPU/Software/BinManager.h
@@ -24,7 +24,7 @@
 struct BinWaitable;
 class DrawBinItemsTask;
 
-enum class BinItemType {
+enum class BinItemType : uint8_t {
 	TRIANGLE,
 	CLEAR_RECT,
 	RECT,
@@ -48,7 +48,7 @@ struct BinCoords {
 
 struct BinItem {
 	BinItemType type;
-	int stateIndex;
+	uint16_t stateIndex;
 	BinCoords range;
 	VertexData v0;
 	VertexData v1;
@@ -237,9 +237,9 @@ protected:
 
 private:
 	BinStateQueue states_;
-	int stateIndex_;
 	BinClutQueue cluts_;
-	int clutIndex_;
+	uint16_t stateIndex_;
+	uint16_t clutIndex_;
 	BinCoords scissor_;
 	BinItemQueue queue_;
 	BinCoords queueRange_;