Fixes for go 1.2