Improve GOPATH support