Fix error if no locals are passed
Start fixing the demo