Fixed Client and CMakeLists