Couple more improvements in ping and log messages