diff --git a/src/comm/comm.go b/src/comm/comm.go
index 70c4a8ab..607f8f6c 100644
--- a/src/comm/comm.go
+++ b/src/comm/comm.go
@@ -17,7 +17,7 @@ type Comm struct {
 
 // NewConnection gets a new comm to a tcp address
 func NewConnection(address string) (c *Comm, err error) {
-	connection, err := net.DialTimeout("tcp", address, 3*time.Second)
+	connection, err := net.DialTimeout("tcp", address, 30*time.Second)
 	if err != nil {
 		return
 	}
diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go
index 01be938e..e69915f1 100644
--- a/src/tcp/tcp.go
+++ b/src/tcp/tcp.go
@@ -70,7 +70,7 @@ func (s *server) start() (err error) {
 
 func (s *server) run() (err error) {
 	log.Debugf("starting TCP server on " + s.port)
-	server, err := net.Listen("tcp", "0.0.0.0:"+s.port)
+	server, err := net.Listen("tcp", ":"+s.port)
 	if err != nil {
 		return errors.Wrap(err, "Error listening on :"+s.port)
 	}