Some fixes to support new demo.