Usage monitoring fixes