Small changes to make the demo work.