Ported to current weekly.
diff --git a/gocheck.go b/gocheck.go
index acd9ec6..2563e4f 100644
--- a/gocheck.go
+++ b/gocheck.go
@@ -232,7 +232,7 @@
 				c.logf("... Panic: %s (PC=0x%X)\n", value, pc)
 			}
 			name := niceFuncName(pc)
-			if name == "reflect.internalValue.call" || name == "gocheck.forkTest" {
+			if name == "reflect.Value.call" || name == "gocheck.forkTest" {
 				break
 			}
 			c.logf("%s:%d\n  in %s", nicePath(file), line, name)
diff --git a/helpers.go b/helpers.go
index 7dd96ef..1e71e69 100644
--- a/helpers.go
+++ b/helpers.go
@@ -92,7 +92,7 @@
 // Output enables *C to be used as a logger in functions that require only
 // the minimum interface of *log.Logger.
 func (c *C) Output(calldepth int, s string) error {
-	ns := time.Nanoseconds()
+	ns := time.Now().Sub(time.Time{}).Nanoseconds()
 	t := float64(ns%100e9) / 1e9
 	c.Logf("[LOG] %.05f %s", t, s)
 	return nil
diff --git a/helpers_test.go b/helpers_test.go
index 6150119..11b2d0d 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -379,7 +379,7 @@
 
 func isDir(path string) bool {
 	if stat, err := os.Stat(path); err == nil {
-		return stat.IsDirectory()
+		return stat.IsDir()
 	}
 	return false
 }