diff --git a/arch/unix/unix.c b/arch/unix/unix.c
index d434444..1eddaec 100644
--- a/arch/unix/unix.c
+++ b/arch/unix/unix.c
@@ -52,13 +52,12 @@ void boot(void);
 
 /* local variables */
 
-ucell *latest, *state;
-ucell *memory;
+static ucell *memory;
 
-int diskemu;
+static int diskemu;
 
 static int segfault = 0;
-int verbose = 0;
+static int verbose = 0;
 
 #ifdef CONFIG_PPC
 uint32_t isa_io_base;
@@ -477,7 +476,7 @@ int main(int argc, char *argv[])
 		sa.sa_sigaction = segv_handler;
 		sigemptyset(&sa.sa_mask);
 		sa.sa_flags = SA_SIGINFO | SA_NODEFER;
-		sigaction(SIGSEGV, &sa, 0);
+		sigaction(SIGSEGV, &sa, NULL);
 
 		if (verbose)
 			printk("done.\n");
@@ -492,7 +491,7 @@ int main(int argc, char *argv[])
         sa.sa_sigaction = int_handler;
         sigemptyset(&sa.sa_mask);
         sa.sa_flags = SA_SIGINFO | SA_NODEFER;
-        sigaction(SIGINT, &sa, 0);
+        sigaction(SIGINT, &sa, NULL);
 
         if (verbose)
             printk("done.\n");
diff --git a/libgcc/libgcc.h b/libgcc/libgcc.h
index c0dce24..cdf1d91 100644
--- a/libgcc/libgcc.h
+++ b/libgcc/libgcc.h
@@ -27,7 +27,7 @@ DItype __ashrdi3 (DItype u, word_type b);
 // Must be implemented outside:
 void __divide_error(void);
 
-#ifdef __arch64__
+#if defined(__arch64__) || defined(__LP64__)
 typedef          int TItype     __attribute__ ((mode (TI)));
 
 __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem);