Fixing up the client