Client stub fixes.