Fixes for go1.1