diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93cec31..a8dc823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ set(SOURCES
 )
 
 if ((${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))
-    add_library(flint ${SOURCES} src/macos.c)
+    add_library(flint ${SOURCES} src/macos/macos.c)
 else()
     add_library(flint ${SOURCES})
 endif()
diff --git a/src/crypto.c b/src/crypto.c
index d0cfea9..f907d6e 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -20,7 +20,7 @@ static const char b64_table[] = {
 
 typedef struct {
     unsigned char *ptr;
-    int count;
+    size_t count;
 } b64_buf;
 
 static int new_b64_buf(b64_buf *b) {
@@ -204,7 +204,7 @@ unsigned char *b64_decode(const char *s, size_t sz, size_t *decode_sz) {
 
 unsigned char *hex_decode(const char *orig, size_t *sz) {
     size_t buf_sz = strlen(orig) + 1;
-    char *sptr = orig;
+    const char *sptr = orig;
     if (strncmp(orig, "0x", 2) == 0) {
         buf_sz -= 2;
         sptr += 2;
diff --git a/src/macos.c b/src/macos/macos.c
similarity index 100%
rename from src/macos.c
rename to src/macos/macos.c
diff --git a/src/parsing.c b/src/parsing.c
index eb1520f..5fa7f48 100644
--- a/src/parsing.c
+++ b/src/parsing.c
@@ -25,4 +25,5 @@ int simple_english_scoring(const char *s) {
         score += ses_score_sw(*c);
     }
     return score;
-}
\ No newline at end of file
+}
+