Backport client fixes.