Ndl: various fixes to PCI and MetaLib templates.