diff --git a/include/PacketBuffer/Serializer/Std/Map.h b/include/PacketBuffer/Serializer/Std/Map.h
index 26f2e5b..9760736 100644
--- a/include/PacketBuffer/Serializer/Std/Map.h
+++ b/include/PacketBuffer/Serializer/Std/Map.h
@@ -65,7 +65,7 @@ namespace PacketBuffer {
 			uint64_t items;
 			unpacker(items);
 
-			for(int i = 0; i < items; i++) {
+			for(uint64_t i = 0; i < items; i++) {
 				std::pair<K, V> entry;
 				unpacker(entry);
 				map.insert(std::move(entry));
@@ -100,7 +100,7 @@ namespace PacketBuffer {
 			uint64_t items;
 			unpacker(items);
 
-			for(int i = 0; i < items; i++) {
+			for(uint64_t i = 0; i < items; i++) {
 				std::pair<K, V> entry;
 				unpacker(entry);
 				map.insert(std::move(entry));
diff --git a/include/PacketBuffer/Serializer/Std/Vector.h b/include/PacketBuffer/Serializer/Std/Vector.h
index 8f31b7f..50fab0d 100644
--- a/include/PacketBuffer/Serializer/Std/Vector.h
+++ b/include/PacketBuffer/Serializer/Std/Vector.h
@@ -61,7 +61,7 @@ namespace PacketBuffer {
 		static inline void pack(Packer& packer, const std::vector<T, Allocator>& vector) {
 			auto items = static_cast<uint64_t>(vector.size());
 			packer(items);
-			for(int i = 0; i < items; i++) {
+			for(uint64_t i = 0; i < items; i++) {
 				packer(vector[i]);
 			}
 		}
@@ -72,7 +72,7 @@ namespace PacketBuffer {
 			unpacker(items);
 
 			vector.resize((size_t) items);
-			for(int i = 0; i < items; i++) {
+			for(uint64_t i = 0; i < items; i++) {
 				unpacker(vector[i]);
 			}
 		}