Fixing latest demo changes related to API refactoring.