Client implementation fixes.