Some fixes for non responding host along the path