Fix flow control issues with late grant