diff --git a/src/core/util.c b/src/core/util.c
index 407545f6..d4af5667 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -596,6 +596,11 @@ JanetTable *janet_get_core_table(const char *name) {
 
 /* Clock shims for various platforms */
 #ifdef JANET_GETTIME
+/* For macos */
+#ifdef __MACH__
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
 #ifdef JANET_WINDOWS
 int janet_gettime(struct timespec *spec) {
     FILETIME ftime;
diff --git a/src/mainclient/shell.c b/src/mainclient/shell.c
index 2c28c9bb..600ac8c3 100644
--- a/src/mainclient/shell.c
+++ b/src/mainclient/shell.c
@@ -1006,8 +1006,10 @@ int main(int argc, char **argv) {
     SetConsoleOutputCP(65001);
 #endif
 
+#if !defined(JANET_WINDOWS) && !defined(JANET_SIMPLE_GETLINE)
     /* Try and not leave the terminal in a bad state */
     atexit(norawmode);
+#endif
 
     /* Set up VM */
     janet_init();