Cookiecutter template fixes

we missed a few template things on cookiecutter conversion...