fix some on template to get the full demo working