--- qtools/qgdict.cpp
+++ qtools/qgdict.cpp
@@ -996,7 +996,7 @@
 		break;
 	    case IntKey:
 		{
-		    Q_UINT32 k;
+		    Q_UINT64 k;
 		    s >> k;
 		    read( s, d );
 		    look_int( k, d, op_insert );
@@ -1004,7 +1004,7 @@
 		break;
 	    case PtrKey:
 		{
-		    Q_UINT32 k;
+		    Q_UINT64 k;
 		    s >> k;
 		    read( s, d );
 		    // ### cannot insert 0 - this renders the thing
--- src/util.cpp
+++ src/util.cpp
@@ -4281,10 +4281,10 @@
   if (shortNames) // use short names only
   {
     static QDict<void> usedNames(10007);
-    static int count=1;
+    static long int count=1;
 
     void *value=usedNames.find(name);
-    int num;
+    long int num;
     if (value==0)
     {
       usedNames.insert(name,(void *)count);
@@ -4292,9 +4292,9 @@
     }
     else
     {
-      num = *(int*)&value;
+      num = *(long int*)&value;
     }
-    result.sprintf("a%05d",num); 
+    result.sprintf("a%05ld",num); 
   }
   else // long names
   {