Better defaults for demo