Golang updates (thx dougm)