Improve ping passthrough

-