Minor modifications in demo files