Broken build related to templates