Fixed client some more.