Fix instance ID and other small things for demo