Minor improvements on default templates