Trying to fix go 1.0 problems