Fixed client construction/destruction.