Minor tweaks in template's setup script