Small bugfixes from code churn (moved templates / missing imports)