Minor rate-limiting fixes