Fixed more bugs with the overage handler.