diff --git a/libc/bionic/tmpfile.cpp b/libc/bionic/tmpfile.cpp
index ad58a9275..b97cc6c24 100644
--- a/libc/bionic/tmpfile.cpp
+++ b/libc/bionic/tmpfile.cpp
@@ -57,7 +57,7 @@ class ScopedSignalBlocker {
 static FILE* __tmpfile_dir(const char* tmp_dir) {
   char buf[PATH_MAX];
   int path_length = snprintf(buf, sizeof(buf), "%s/tmp.XXXXXXXXXX", tmp_dir);
-  if (path_length >= sizeof(buf)) {
+  if (path_length >= static_cast<int>(sizeof(buf))) {
     return NULL;
   }
 
diff --git a/libc/upstream-netbsd/extern.h b/libc/upstream-netbsd/extern.h
index 942e23754..616becdc9 100644
--- a/libc/upstream-netbsd/extern.h
+++ b/libc/upstream-netbsd/extern.h
@@ -17,6 +17,12 @@
 #ifndef _BIONIC_NETBSD_EXTERN_H_included
 #define _BIONIC_NETBSD_EXTERN_H_included
 
-// Placeholder.
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+const char* __strsignal(int, char*, size_t);
+
+__END_DECLS
 
 #endif
diff --git a/tests/stubs_test.cpp b/tests/stubs_test.cpp
index d2d0ad837..9daaa2200 100644
--- a/tests/stubs_test.cpp
+++ b/tests/stubs_test.cpp
@@ -34,7 +34,7 @@ typedef enum {
   TYPE_APP
 } uid_type_t;
 
-static void check_getpwnam(const char* username, int uid, uid_type_t uid_type) {
+static void check_getpwnam(const char* username, uid_t uid, uid_type_t uid_type) {
   errno = 0;
   passwd* pwd = getpwuid(uid);
   ASSERT_TRUE(pwd != NULL);