Various post-demo fixes.