Fixed client again, among other things.