Fix monitoring issues