Fix up last demo