Fixing client problems