fixes for go 1.2