Demo client fixes