Fix Go 1.0.x build errors