Fix monitor templates
Nice git logs