A few fixes and the counter limiter