Minor template fixes.
Merge pull request #616 from emanuelschuetze/last-1.4a1-changes

Minor template fixes