Updated client with fixes from backend