Fix CLI Demo
Update Demo projects and schemes