Fix some bugs in the demo - PZI works now