Fixed some demo issues.