fixes to consensus/ for go 1.1