Fixed Client Node a bit