Typical day-of-demo fixes