[demo] Minor fixes to get the demo working