Pre-demo changes.