more monitoring fixes