Fixing some minor template errors