--- api/avahi/src/Clib/bglavahi.c.orig	2020-05-12 00:35:36.000000000 -0600
+++ api/avahi/src/Clib/bglavahi.c	2020-07-22 11:37:30.380107176 -0600
@@ -482,7 +482,7 @@ AvahiStringList *
 bgl_avahi_list_to_string_list( obj_t p ) {
    // MS: 28 feb 2017
    // AvahiStringList *l = avahi_string_list_new( "", NULL );
-   AvahiStringList *l = avahi_string_list_new( 0L );
+   AvahiStringList *l = avahi_string_list_new( NULL );
 
    while( PAIRP( p ) ) {
       l = avahi_string_list_add( l, BSTRING_TO_STRING( CAR( p ) ) );
--- bde/bmem/lib/gchook.c.orig	2020-05-12 00:35:36.000000000 -0600
+++ bde/bmem/lib/gchook.c	2020-07-22 11:45:57.602471427 -0600
@@ -57,12 +57,12 @@ GC_collect_hook( int heapsz, long livesz
 		  ((double)heapsz / (1024. * 1024.)),
 		  ((double)livesz / (1024. * 1024.)) );
       } else {
-	 fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB, fun=%s\n",
+	 fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB, fun=%lu\n",
 		  gc_number,
 		  gc_alloc_size / 1024,
 		  heapsz / 1024,
 		  livesz / 1024,
-		  lf );
+		  (unsigned long)lf );
       }
    }
       
@@ -104,7 +104,7 @@ GC_dump_gc_sexp( gc_info_t *i, FILE *f )
 /*---------------------------------------------------------------------*/
 static void
 GC_dump_gc_json( gc_info_t *i, FILE *f ) {
-   fprintf( f, "    { \"number\": %lu, \"alloc\": %lu, \"heap\": %lu, \"live\": %lu, \"lastfun\": %s, \"time\": %ld }",
+   fprintf( f, "    { \"number\": %lu, \"alloc\": %lu, \"heap\": %lu, \"live\": %lu, \"lastfun\": %s, \"time\": %lld }",
 	    i->number,
 	    BMEMSIZE( i->alloc_size ),
 	    i->heap_size,
--- comptime/Cc/exec.c.orig	2020-05-12 00:36:18.000000000 -0600
+++ comptime/Cc/exec.c	2020-07-22 11:37:30.381107176 -0600
@@ -332,7 +332,7 @@ extern "C"
 									BSTRING_TO_STRING(BGl_za2shellza2z00zzengine_paramz00);
 								BgL_arg1031z00_37 =
 									execl(BgL_tmpz00_118, BgL_auxz00_120, BgL_auxz00_122,
-									BgL_auxz00_124, 0L);
+									BgL_auxz00_124, NULL);
 							}
 							bgl_display_obj(BINT(BgL_arg1031z00_37), BgL_port1017z00_36);
 						}