Minor product template improvements