Port existing fixes + do new fixes for Cleave Ping