Addressed issues with rate limiting