Ping fixes