Fixes for go
Merge pull request #1 from ehershey/gotools2

Fixes for go