Changes to support running the demo from the new repository.