Fixup build with golang 1.12