Fixes for go1.3