[Code] Monitoring fixes.