more go 1.0 fixes