More changes for Go 1.0 compat