C++ demos working again.