diff --git a/lib/ebml.cpp b/lib/ebml.cpp
index 6e5e1652..e38ed2c2 100644
--- a/lib/ebml.cpp
+++ b/lib/ebml.cpp
@@ -55,13 +55,13 @@ namespace EBML{
   void UniInt::writeInt(char *p, const uint64_t val){
     switch (writeSize(val)){
     case 1: p[0] = val | 0x80; break;
-    case 2: Bit::htobs(p, val | 0x4000); break;
-    case 3: Bit::htob24(p, val | 0x200000); break;
-    case 4: Bit::htobl(p, val | 0x10000000); break;
-    case 5: Bit::htob40(p, val | 0x800000000); break;
-    case 6: Bit::htob48(p, val | 0x40000000000); break;
-    case 7: Bit::htob56(p, val | 0x2000000000000); break;
-    case 8: Bit::htobll(p, val | 0x100000000000000); break;
+    case 2: Bit::htobs(p, val | 0x4000ull); break;
+    case 3: Bit::htob24(p, val | 0x200000ull); break;
+    case 4: Bit::htobl(p, val | 0x10000000ull); break;
+    case 5: Bit::htob40(p, val | 0x800000000ull); break;
+    case 6: Bit::htob48(p, val | 0x40000000000ull); break;
+    case 7: Bit::htob56(p, val | 0x2000000000000ull); break;
+    case 8: Bit::htobll(p, val | 0x100000000000000ull); break;
     }
   }
 
diff --git a/lib/ebml_socketglue.cpp b/lib/ebml_socketglue.cpp
index 3d40a0a5..3a9abb62 100644
--- a/lib/ebml_socketglue.cpp
+++ b/lib/ebml_socketglue.cpp
@@ -19,19 +19,19 @@ namespace EBML{
   }
 
   uint8_t sizeUInt(const uint64_t val){
-    if (val >= 0x100000000000000){
+    if (val >= 0x100000000000000ull){
       return 8;
-    }else if (val >= 0x1000000000000){
+    }else if (val >= 0x1000000000000ull){
       return 7;
-    }else if (val >= 0x10000000000){
+    }else if (val >= 0x10000000000ull){
       return 6;
-    }else if (val >= 0x100000000){
+    }else if (val >= 0x100000000ull){
       return 5;
-    }else if (val >= 0x1000000){
+    }else if (val >= 0x1000000ull){
       return 4;
-    }else if (val >= 0x10000){
+    }else if (val >= 0x10000ull){
       return 3;
-    }else if (val >= 0x100){
+    }else if (val >= 0x100ull){
       return 2;
     }else{
       return 1;