diff --git a/ChangeLog b/ChangeLog
index 37c81b93..65b345c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-27  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Fixed compile error on Mac OS X, on 64Bit OS maybe.
+	* src/DHTBucket.cc
+
+	Removed unnecessary cast.
+	* src/HandshakeExtensionMessage.cc
+
 2008-02-27  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed the bug that option handler for PREF_METALINK_ENABLE_UNIQUE_PROTOCOL.
diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc
index 2993a9a9..a5045baf 100644
--- a/src/DHTBucket.cc
+++ b/src/DHTBucket.cc
@@ -46,7 +46,7 @@
 
 namespace aria2 {
 
-DHTBucket::DHTBucket(uint32_t prefixLength,
+DHTBucket::DHTBucket(size_t prefixLength,
 		     const unsigned char* max, const unsigned char* min,
 		     const SharedHandle<DHTNode>& localNode):
   _prefixLength(prefixLength),
diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc
index b8ff0b96..4663c138 100644
--- a/src/HandshakeExtensionMessage.cc
+++ b/src/HandshakeExtensionMessage.cc
@@ -74,7 +74,7 @@ std::string HandshakeExtensionMessage::getBencodedData()
   for(std::map<std::string, uint8_t>::const_iterator itr = _extensions.begin();
       itr != _extensions.end(); ++itr) {
     const std::map<std::string, uint8_t>::value_type& vt = *itr;
-    std::string idStr = Util::uitos((uint32_t)vt.second);
+    std::string idStr = Util::uitos(vt.second);
     exts->put(vt.first, new Data(idStr, true));
   }
   BencodeVisitor v;
@@ -94,7 +94,7 @@ std::string HandshakeExtensionMessage::toString() const
   for(std::map<std::string, uint8_t>::const_iterator itr = _extensions.begin();
       itr != _extensions.end(); ++itr) {
     const std::map<std::string, uint8_t>::value_type& vt = *itr;
-    s += ", "+vt.first+"="+Util::uitos((uint32_t)vt.second);
+    s += ", "+vt.first+"="+Util::uitos(vt.second);
   }
   return s;
 }