Adjust for Go 1.4