Minor fixes to default template after comparing to master branch.