Last fixes of rate limitation