Even more fixes for the monitoring.