diff --git a/cmd/tmsp_cli/tmsp_cli.go b/cmd/tmsp-cli/tmsp-cli.go
similarity index 93%
rename from cmd/tmsp_cli/tmsp_cli.go
rename to cmd/tmsp-cli/tmsp-cli.go
index d90dd10b7..c9684063f 100644
--- a/cmd/tmsp_cli/tmsp_cli.go
+++ b/cmd/tmsp-cli/tmsp-cli.go
@@ -3,10 +3,12 @@ package main
 import (
 	"bufio"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"net"
 	"os"
+	"reflect"
 	"strings"
 
 	. "github.com/tendermint/go-common"
@@ -241,13 +243,13 @@ func makeRequest(conn net.Conn, req types.Request) (types.Response, error) {
 	var err error
 
 	// Write desired request
-	wire.WriteBinaryLengthPrefixed(req, conn, &n, &err)
+	wire.WriteBinaryLengthPrefixed(struct{ types.Request }{req}, conn, &n, &err)
 	if err != nil {
 		return nil, err
 	}
 
 	// Write flush request
-	wire.WriteBinaryLengthPrefixed(types.RequestFlush{}, conn, &n, &err)
+	wire.WriteBinaryLengthPrefixed(struct{ types.Request }{types.RequestFlush{}}, conn, &n, &err)
 	if err != nil {
 		return nil, err
 	}
@@ -260,11 +262,14 @@ func makeRequest(conn net.Conn, req types.Request) (types.Response, error) {
 	}
 
 	// Read flush response
-	var resFlush types.ResponseFlush
+	var resFlush types.Response
 	wire.ReadBinaryPtrLengthPrefixed(&resFlush, conn, 0, &n, &err)
 	if err != nil {
 		return nil, err
 	}
+	if _, ok := resFlush.(types.ResponseFlush); !ok {
+		return nil, errors.New(Fmt("Expected types.ResponseFlush but got %v instead", reflect.TypeOf(resFlush)))
+	}
 
 	return res, nil
 }
diff --git a/example/golang/dummy_test.go b/example/golang/dummy_test.go
index 38b9b3d39..d0d16ac90 100644
--- a/example/golang/dummy_test.go
+++ b/example/golang/dummy_test.go
@@ -35,8 +35,7 @@ func TestStream(t *testing.T) {
 			var n int
 			var err error
 			var res types.Response
-			wire.ReadVarint(conn, &n, &err) // ignore
-			wire.ReadBinaryPtr(&res, conn, 0, &n, &err)
+			wire.ReadBinaryPtrLengthPrefixed(&res, conn, 0, &n, &err)
 			if err != nil {
 				Exit(err.Error())
 			}