Minor adjustments in the Demo functionality