diff --git a/src/iptc.cpp b/src/iptc.cpp
index 99b019f4..22dc2349 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -506,7 +506,7 @@ namespace Exiv2 {
                 uint16_t sizeOfSize = 4 | 0x8000;
                 us2Data(pWrite, sizeOfSize, bigEndian);
                 pWrite += 2;
-                ul2Data(pWrite, dataSize, bigEndian);
+                ul2Data(pWrite, (uint32_t) dataSize, bigEndian);
                 pWrite += 4;
             }
             else {
diff --git a/src/types.cpp b/src/types.cpp
index 8055ad45..10dd3ba2 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -351,7 +351,7 @@ namespace Exiv2 {
     long ul2Data(byte* buf, size_t s, ByteOrder byteOrder)
     {
         uint32_t l = (uint32_t) s;
-        return ul2Data(buf,l,byteOrder); // TODO: should this be sizeof(size_t) ?
+        return ul2Data(buf,l,byteOrder);
     }
 #endif