Update fabric; update events demo to have 3 objects (which exposes bug)