Some fixes in the demo page