Follow-up for "New project templates"

TBR: @umop - Fixes a few things in #1898