Changed client code
Fixed server1 compilation errors