diff --git a/dumpidx.c b/dumpidx.c
index 8d5c09d..94d2df3 100644
--- a/dumpidx.c
+++ b/dumpidx.c
@@ -4,7 +4,7 @@
 
 int main() {
   int verbose=0;
-  long filelen;
+  unsigned long filelen;
   char* map=mmap_read("data",&filelen);
   uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table;
   buffer_puts(buffer_1,"magic: ");
diff --git a/idx2ldif.c b/idx2ldif.c
index 901e85c..39b298b 100644
--- a/idx2ldif.c
+++ b/idx2ldif.c
@@ -1,3 +1,4 @@
+#include <alloca.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include "buffer.h"
@@ -31,7 +32,7 @@ static void dumpbstr(const char* c) {
 
 int main() {
   int verbose=1;
-  long filelen;
+  unsigned long filelen;
   char* map=mmap_read("data",&filelen);
   uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table;
   uint32_unpack(map,&magic);
diff --git a/scan_ldapbindrequest.c b/scan_ldapbindrequest.c
index 56dc42f..986ac6f 100644
--- a/scan_ldapbindrequest.c
+++ b/scan_ldapbindrequest.c
@@ -5,7 +5,7 @@ int scan_ldapbindrequest(const char* src,const char* max,
 			 unsigned long* version,struct string* name,
 			 unsigned long* method) {
   int res,tmp;
-  if (!(res=scan_asn1INTEGER(src,max,version))) return 0;
+  if (!(res=scan_asn1INTEGER(src,max,(signed long*)version))) return 0;
   if (!(tmp=scan_ldapstring(src+res,max,name))) return 0;
   res+=tmp;
   {
diff --git a/scan_ldapmessage.c b/scan_ldapmessage.c
index 9f8ef15..1bf1dc8 100644
--- a/scan_ldapmessage.c
+++ b/scan_ldapmessage.c
@@ -5,7 +5,7 @@ int scan_ldapmessage(const char* src,const char* max,
 		     unsigned long* messageid,unsigned long* op,unsigned long* len) {
   int res,tmp;
   if (!(res=scan_asn1SEQUENCE(src,max,len))) goto error;
-  if (!(tmp=scan_asn1INTEGER(src+res,max,messageid))) goto error;
+  if (!(tmp=scan_asn1INTEGER(src+res,max,(long*)messageid))) goto error;
   res+=tmp;
   {
     enum asn1_tagclass tc;
diff --git a/t2.c b/t2.c
index fd87dd2..ff6d66c 100644
--- a/t2.c
+++ b/t2.c
@@ -118,11 +118,10 @@ int main(int argc,char* argv[]) {
     case BindResponse:
       puts("  >> BindResponse <<");
       {
-	long result;
+	unsigned long result;
 	struct string matcheddn,errormessage,referral;
-	int tmp;
 	printf("scan_ldapbindresponse: %d\n",
-	       tmp=scan_ldapbindresponse(ldapsequence+done+res,ldapsequence+done+res+len,
+	       scan_ldapbindresponse(ldapsequence+done+res,ldapsequence+done+res+len,
 					 &result,&matcheddn,&errormessage,&referral));
 	printf("result %lu, matcheddn \"%.*s\", errormessage \"%.*s\", referral \"%.*s\"\n",
 	       result,(int)matcheddn.l,matcheddn.s,
@@ -162,8 +161,7 @@ int main(int argc,char* argv[]) {
       puts("  >> SearchResultEntry <<");
       {
 	struct SearchResultEntry sre;
-	int tmp;
-	if ((tmp=scan_ldapsearchresultentry(ldapsequence+done+res,ldapsequence+done+res+len,&sre))) {
+	if (scan_ldapsearchresultentry(ldapsequence+done+res,ldapsequence+done+res+len,&sre)) {
 	  struct PartialAttributeList* pal=sre.attributes;
 	  printf("objectName \"%.*s\"\n",(int)sre.objectName.l,sre.objectName.s);
 	  while (pal) {
@@ -186,9 +184,8 @@ int main(int argc,char* argv[]) {
       {
 	long result;
 	struct string matcheddn,errormessage,referral;
-	int tmp;
 	printf("scan_ldapresult: %d\n",
-	       tmp=scan_ldapresult(ldapsequence+done+res,ldapsequence+done+res+len,
+	       scan_ldapresult(ldapsequence+done+res,ldapsequence+done+res+len,
 				   &result,&matcheddn,&errormessage,&referral));
 	printf("result %lu, matcheddn \"%.*s\", errormessage \"%.*s\", referral \"%.*s\"\n",
 	       result,(int)matcheddn.l,matcheddn.s,
@@ -202,9 +199,9 @@ int main(int argc,char* argv[]) {
     case AbandonRequest:
       puts("  >> AbandonRequest <<");
       {
-	unsigned long which;
+	long which;
 	if (scan_asn1rawint(ldapsequence+done+res,ldapsequence+done+res+len,len,&which))
-	  printf("Abandon: %lu\n",which);
+	  printf("Abandon: %lu\n",(unsigned long)which);
       }
       break;
     default: