Fix more Go 1.0.x errors