diff --git a/ft/valgrind.suppressions b/ft/valgrind.suppressions
index 676ca442bbc0babf85773564612c86a1bc272494..15d91fb922d27caee24a3035ac57541b27835267 100644
--- a/ft/valgrind.suppressions
+++ b/ft/valgrind.suppressions
@@ -154,21 +154,18 @@
    Memcheck:Leak
    ...
    obj:/usr/lib/dyld
-   ...
 }
 {
    dyld_on_OSX
    Memcheck:Value8
    ...
    obj:/usr/lib/dyld
-   ...
 }
 {
    dyld_on_OSX
    Memcheck:Cond
    ...
    obj:/usr/lib/dyld
-   ...
 }
 {
    ctime_on_OSX
@@ -177,7 +174,6 @@
    obj:/usr/lib/system/libsystem_c.dylib
    ...
    fun:asctime_r
-   ...
 }
 {
    ctime_on_OSX
@@ -186,7 +182,6 @@
    obj:/usr/lib/system/libsystem_c.dylib
    ...
    fun:ctime
-   ...
 }
 {
    pthread_join_on_OSX
@@ -194,5 +189,33 @@
    ...
    obj:/usr/lib/system/libsystem_c.dylib
    fun:pthread_join
+}
+{
+   pthread_start_on_OSX
+   Memcheck:Leak
+   ...
+   fun:_pthread_start
+   obj:/usr/lib/system/libsystem_c.dylib
+}
+{
+   printf_etc_on_OSX
+   Memcheck:Leak
+   ...
+   fun:__dtoa
+   ...
+   obj:/usr/lib/system/libsystem_c.dylib
+}
+{
+   printf_etc_on_OSX
+   Memcheck:Leak
+   ...
+   fun:__smakebuf
+   ...
+   obj:/usr/lib/system/libsystem_c.dylib
+}
+{
+   popen_on_OSX
+   Memcheck:Leak
    ...
+   fun:popen$DARWIN_EXTSN
 }
diff --git a/scripts/tokugrind b/scripts/tokugrind
index 3ed2cb9a5b2a215367cee9a48b87b60d54e48c75..00298f5e1fb1d69fad5346981fe44f2c2232f708 100755
--- a/scripts/tokugrind
+++ b/scripts/tokugrind
@@ -38,7 +38,8 @@ fi
 valgrind $args
 exitcode=$?
 if [ $exitcode = 0 ] ; then
-    lines=`cat $logfile | wc -l`
+    # ignore "empty" valgrind lines, and ignore the warning about not running well on OSX 10.8 that start with WARNING:
+    lines=`grep -v '==\ WARNING:\ ' $logfile | grep -v '--[0-9]\+:[0-9]\+:syswrap-\ WARNING:\ Ignoring\ sigreturn\(\ \.\.\.,\ UC_RESET_ALT_STACK\ \);' | grep -v '^==[0-9]\+==\ $' | grep -v '^$' | grep -v '^UNKNOWN\ task\ message\ \[id\ 3403,\ to\ mach_task_self(),\ reply' | wc -l`
     if [ $lines -ne 0 ] ; then
 	exitcode=$errorexitcode
     fi
@@ -50,7 +51,3 @@ if [ $createlogfile != 0 ] ; then
 fi
 
 exit $exitcode
-
-
-
-