Handle rate limiting better