Minor adjustments to monitoring