pre-demo fixes