More undefined client name fixes