Build fixes for tok.go.