Client enhancements.