Various changes prior to demo.