Fixed Client bugs