fixing more monitoring issues