Fixes for client.