Client bug fixes