WIP: Template fixes