Various changes required by demo.