Fix small bugs in the demo