Client improvements.