diff --git a/bindings/timeNow.go b/bindings/timeNow.go
index dbeda1696669f98b9a489990ced0f66f51c9757b..82cc2d798d8da4c16936b53b2ed3621b175e0e02 100644
--- a/bindings/timeNow.go
+++ b/bindings/timeNow.go
@@ -13,12 +13,12 @@ import (
 )
 
 type TimeSource interface {
-	NowMs() int
+	NowMs() int64
 }
 
 // SetTimeSource sets the network time to a custom source.
 func SetTimeSource(timeNow TimeSource) {
 	netTime.Now = func() time.Time {
-		return time.Unix(0, int64(timeNow.NowMs()*int(time.Millisecond)))
+		return time.Unix(0,timeNow.NowMs()*int64(time.Millisecond))
 	}
 }
diff --git a/network/message/sendCmix.go b/network/message/sendCmix.go
index eca56777b03cbd10fc5fba77d6b0a9a96f7b234a..1b4f0e109ad3ea67078778c651856d299d2eb68b 100644
--- a/network/message/sendCmix.go
+++ b/network/message/sendCmix.go
@@ -34,7 +34,7 @@ type sendCmixCommsInterface interface {
 }
 
 // 1.5 seconds
-const sendTimeBuffer = 3500 * time.Millisecond
+const sendTimeBuffer = 1500 * time.Millisecond
 
 // WARNING: Potentially Unsafe
 // Public manager function to send a message over CMIX