Post demo fixes