Minor Fixes to Client