monitoring fixes