Add cross client fixes

Add cross client fixes