Minor template fixes to pbuilder