Fix build problems with pre-1.1 Go