Update demo with fixes from OIT.