more tweaks for Go