Updated demo with latest API fixes