Minor changes in templates

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>