Improve :GoBuild