Rate limiting bug fixes