Client bug fixes.