Templates for Nagios and small fix