Fix demo issues.