more go fixing for master branch and osx