Fixes for go-tip