diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 39bc1552efa..6a841eedaf3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,8 @@ This doc is intended for contributors to `cadence` server (hopefully that's you!
 Make sure the repository is cloned to the correct location:
 
 ```bash
-go get github.com/uber/cadence/...
+cd $GOPATH
+git clone https://github.com/uber/cadence.git src/github.com/uber/cadence
 cd $GOPATH/src/github.com/uber/cadence
 ```
 
@@ -70,3 +71,4 @@ go test -v <path> -run <TestSuite> -testify.m <TestSpercificTaskName>
 # example:
 go test -v github.com/uber/cadence/common/persistence -run TestCassandraPersistenceSuite -testify.m TestPersistenceStartWorkflow
 ```
+
diff --git a/Makefile b/Makefile
index 5c35a69cb49..dc77c5d0e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ THRIFTRW_GEN_SRC += $(THRIFT_GENDIR)/go/$1/$1.go
 
 $(THRIFT_GENDIR)/go/$1/$1.go:: $2
 	@mkdir -p $(THRIFT_GENDIR)/go
-	$(ECHO_V)thriftrw --plugin=yarpc --pkg-prefix=$(PROJECT_ROOT)/$(THRIFT_GENDIR)/go/ --out=$(THRIFT_GENDIR)/go $2
+	$(GOPATH)/bin/thriftrw --plugin=yarpc --pkg-prefix=$(PROJECT_ROOT)/$(THRIFT_GENDIR)/go/ --out=$(THRIFT_GENDIR)/go $2
 endef
 
 $(foreach tsrc,$(THRIFTRW_SRCS),$(eval $(call \
@@ -174,4 +174,4 @@ start-cdc-active: bins
 	./cadence-server --zone active start
 
 start-cdc-standby: bins
-	./cadence-server --zone standby start
\ No newline at end of file
+	./cadence-server --zone standby start