Fixed latest changes per client spec.