post-demo fixes