Cross client fixes

Cross client fixes