Fix Client bugs