Added a few missing definitions in the new demo.