Client Fixes.