Merge ping fixes