Some changes to make the demo work