Last minute pre-demo changes.