demo(all): various fixes